From 2e7b23809c61d75c9a60c83ac78badae8a92541b Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 11 十一月 2025 16:41:34 +0800
Subject: [PATCH] 根据新模块调整UI页面 添加 退货通知单列表 生产订单列表 发货通知单列表 页面

---
 src/views/basic/gyStockPlace/gyStockPlaceEdit.vue      |    0 
 src/views/sell/XsSeOutStockBackBillList.vue            |  346 +--
 src/views/basic/gyStockPlace/gyStockPlace.vue          |  141 
 src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue |  318 +--
 src/views/sell/XsSeOutStockBill.vue                    |  324 +--
 src/store/modules/permission.js                        |  243 +++
 src/views/basic/gyEmployee/gyEmployeeEdit.vue          |    0 
 src/router/index.js                                    |  189 ++
 src/views/basic/gyWarehouse/gyWarehouse.vue            |  160 -
 src/views/basic/gyWarehouse/gyWarehouseEdit.vue        |    0 
 src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue     |  212 +-
 src/views/basic/gySource/index.vue                     |    2 
 /dev/null                                              | 1717 -----------------------
 src/views/ICMO/ScICMOBillList.vue                      |  324 +--
 src/views/basic/gyEmployee/gyEmployee.vue              |  137 
 src/views/sell/xsSeOrderBill/xsSeOrderBill.vue         |  296 +--
 16 files changed, 1,351 insertions(+), 3,058 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index c98489b..9b5f94c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -143,12 +143,7 @@
       },
     ],
   },
-  //閿�鍞崟
-  // {
-  //   path: "/sellBill",
-  //   component: () => import("@/views/sellBill/index"),
-  //   hidden: true,
-  // },
+
   //鐢熶骇璧勬簮
   {
     path: "/basic/gy/gySource",
@@ -179,42 +174,178 @@
     component: () => import("@/views/component/printList/hBarPlanPrint"),
     hidden: true,
   },
-   // 浠撳簱
+  // 浠撳簱
   {
-    path: '/gyWarehouse',
-    component: () => import("@/views/gyWarehouse/index"),
+    path: "/basic/gy/gyWarehouse",
+    component: Layout,
     hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/basic/gy/gyWarehouse", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/basic/gy/gyWarehouse",
+        component: () => import("@/views/basic/gyWarehouse/gyWarehouse"),
+        name: "GyWarehouse",
+        meta: { title: "浠撳簱鍒楄〃", activeMenu: "basic/gy" },
+      },
+    ],
   },
   // 浠撲綅
   {
-    path: '/gyStockPlace',
-    component: () => import("@/views/gyStockPlace/index"),
+    path: "/basic/gy/gyStockPlace",
+    component: Layout,
     hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/basic/gy/gyStockPlace", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/basic/gy/gyStockPlace",
+        component: () => import("@/views/basic/gyStockPlace/gyStockPlace.vue"),
+        name: "GyStockPlace",
+        meta: { title: "浠撲綅鍒楄〃", activeMenu: "basic/gy" },
+      },
+    ],
   },
   // 鑱屽憳
   {
-    path: '/gyEmployee',
-    component: () => import("@/views/gyEmployee/index"),
+    path: "/basic/gy/gyEmployee",
+    component: Layout,
     hidden: true,
-  },
-  // 閲囪喘璁㈠崟
-  {
-    path: '/cgPoOrderBillList',
-    component: () => import("@/views/cgPoOrderBill/index"),
-    hidden: true
-  },
-  // 鏀舵枡閫氱煡鍗�
-  {
-    path: '/cgPoInStockBillList',
-    component: () => import("@/views/cgPoInStockBill/index"),
-    hidden: true
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/basic/gy/gyEmployee", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/basic/gy/gyEmployee",
+        component: () => import("@/views/basic/gyEmployee/gyEmployee.vue"),
+        name: "GyEmployee",
+        meta: { title: "浠撳簱鍒楄〃", activeMenu: "basic/gy" },
+      },
+    ],
   },
   // 閿�鍞鍗�
   {
-    path: "/xsSeOrderBillList",
-    component: () => import("@/views/xsSeOrderBill/index"),
-    hidden: true
-  }
+    path: "/sales/seOrder/xsSeOrderBill",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/sales/seOrder/xsSeOrderBill", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/sales/seOrder/xsSeOrderBill", 
+        component: () => import("@/views/sell/xsSeOrderBill/xsSeOrderBill"),
+        name: "XsSeOrderBill",
+        meta: { title: "閿�鍞鍗曠淮鎶�", activeMenu: "sales/seOrder" },
+      },
+    ],
+  },
+
+  // 閲囪喘璁㈠崟
+  {
+    path: "/purchase/poOrder/cgPoOrderBill",
+    component: Layout,
+    hidden: true,                        
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/purchase/poOrder/cgPoOrderBill", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/purchase/poOrder/cgPoOrderBill",
+        component: () => import("@/views/purchase/cgPoOrderBill/cgPoOrderBill"),
+        name: "CgPoOrderBill",
+        meta: { title: "閲囪喘璁㈠崟鍒楄〃", activeMenu: "/purchase/PoOrder" },
+      },
+    ],
+  },
+  // 鏀舵枡閫氱煡鍗�
+  {
+    path: "/purchase/PoInStock/cgPoInStockBill",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/purchase/PoInStock/cgPoInStockBill", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/purchase/PoInStock/cgPoInStockBill",
+        component: () => import("@/views/purchase/cgPoInStockBill/cgPoInStockBill"),
+        name: "CgPoInStockBillList",
+        meta: { title: "鏀舵枡閫氱煡鍗曞垪琛�", activeMenu: "/purchase/PoInStock" },
+      },
+    ],
+  },
+  // 鍙戣揣閫氱煡鍗�
+  {
+    path: "/sales/seOutStock/xsSeOutStockBill",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/sales/seOutStock/xsSeOutStockBill", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/sales/seOutStock/xsSeOutStockBill",
+        component: () => import("@/views/sell/XsSeOutStockBill.vue"),
+        name: "XsSeOutStockBill",
+        meta: { title: "鍙戣揣閫氱煡鍗曞垪琛�", activeMenu: "/sales/seOutStock" },
+      },
+    ],
+  },
+  // 閫�璐ч�氱煡鍗�
+  {
+    path: "/sales/seOutStockBack/xsSeOutStockBackBillList",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/sales/seOutStockBack/xsSeOutStockBackBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/sales/seOutStockBack/xsSeOutStockBackBillList",
+        component: () => import("@/views/sell/XsSeOutStockBackBillList.vue"),
+        name: "XsSeOutStockBackBillList",
+        meta: { title: "閫�璐ч�氱煡鍗曞垪琛�", activeMenu: "/sales/seOutStockBack" },
+      },
+    ],
+  },
+  // 鐢熶骇璁㈠崟
+  {
+    path: "/ICMO/scIcmoBill/scIcmoBillList",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/ICMO/scIcmoBill/scIcmoBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/ICMO/scIcmoBill/scIcmoBillList",
+        component: () => import("@/views/ICMO/ScICMOBillList.vue"),
+        name: "XsSeOutStockBackBillList",
+        meta: { title: "鐢熶骇璁㈠崟鍒楄〃", activeMenu: "/ICMO/scIcmoBill" },
+      },
+    ],
+  },
 ];
 
 // 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index e72b66a..7539a8c 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -88,8 +88,90 @@
                   },
                 ],
               },
+              {
+                meta: {
+                  icon: "build",
+                  link: null,
+                  noCache: false,
+                  title: "閿�鍞鍗�",
+                },
+                hidden: false,
+                name: "SeOrder",
+                path: "seOrder",
+                redirect: "noRedirect",
+                component: "Layout",
+                children: [
+                  {
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "閿�鍞鍗曠淮鎶�",
+                    },
+                    component: () => import("@/views/sell/xsSeOrderBill/xsSeOrderBill.vue"),
+                    hidden: false,
+                    name: "XsSeOrderBill",
+                    path: "xsSeOrderBill",
+                  },
+                ],
+              },
+              {
+                meta: {
+                  icon: "build",
+                  link: null,
+                  noCache: false,
+                  title: "鍙戣揣閫氱煡鍗�",
+                },
+                hidden: false,
+                name: "SeOutStock",
+                path: "seOutStock",
+                redirect: "noRedirect",
+                component: "Layout",
+                children: [
+                  {
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "鍙戣揣閫氱煡鍗曠淮鎶�",
+                    },
+                    component: () => import("@/views/sell/XsSeOutStockBill.vue"),
+                    hidden: false,
+                    name: "XsSeOutStockBill",
+                    path: "xsSeOutStockBill",
+                  },
+                ],
+              },
+                            {
+                meta: {
+                  icon: "build",
+                  link: null,
+                  noCache: false,
+                  title: "閫�璐ч�氱煡鍗�",
+                },
+                hidden: false,
+                name: "SeOutStockBack",
+                path: "seOutStockBack",
+                redirect: "noRedirect",
+                component: "Layout",
+                children: [
+                  {
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "閫�璐ч�氱煡鍗曠淮鎶�",
+                    },
+                    component: () => import("@/views/sell/XsSeOutStockBackBillList.vue"),
+                    hidden: false,
+                    name: "XsSeOutStockBackBillList",
+                    path: "xsSeOutStockBackBillList",
+                  },
+                ],
+              },
             ],
-          },{
+          },
+          {
             alwaysShow: true,
             component: "Layout",
             meta: {
@@ -129,18 +211,173 @@
                     name: "GySource",
                     path: "gySource",
                   },
+                ],
+              },
+              {
+                meta: {
+                  icon: "build",
+                  link: null,
+                  noCache: false,
+                  title: "鍏敤璧勬枡",
+                },
+                hidden: false,
+                name: "Gy",
+                path: "gy",
+                redirect: "noRedirect",
+                component: "Layout",
+                children: [
                   {
                     meta: {
                       icon: "build",
                       link: null,
                       noCache: false,
-                      title: "鐢熶骇浠撳簱鍒楄〃",
+                      title: "浠撳簱鍒楄〃",
                     },
-                    component: () => import('@/views/basic/gyWarehouse/index.vue'),
+                    component: () =>
+                      import("@/views/basic/gyWarehouse/gyWarehouse.vue"),
                     hidden: false,
                     name: "GyWarehouse",
                     path: "gyWarehouse",
                   },
+                  {
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "浠撲綅鍒楄〃",
+                    },
+                    component: () => import('@/views/basic/gyStockPlace/gyStockPlace.vue'),
+                    hidden: false,
+                    name: "GyStockPlace",
+                    path: "gyStockPlace",
+                  },
+                  {
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "鑱屽憳鍒楄〃",
+                    },
+                    component: () => import('@/views/basic/gyEmployee/gyEmployee.vue'),
+                    hidden: false,
+                    name: "GyEmployee",
+                    path: "gyEmployee",
+                  },
+                ],
+              },
+            ],
+          },
+          {
+            alwaysShow: true,
+            component: "Layout",
+            meta: {
+              icon: "build",
+              link: null,
+              noCache: false,
+              title: "閲囪喘绠$悊",
+            },
+            hidden: false,
+            name: "Purchase",
+            path: "/purchase",
+            redirect: "noRedirect",
+            children: [
+              {
+                meta: {
+                  icon: "build",
+                  link: null,
+                  noCache: false,
+                  title: "閲囪喘璁㈠崟",
+                },
+                hidden: false,
+                name: "PoOrder",
+                path: "poOrder",
+                redirect: "noRedirect",
+                component: "Layout",
+                children: [
+                  {
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "閲囪喘璁㈠崟鍒楄〃",
+                    },
+                    component: () => import("@/views/purchase/cgPoOrderBill/cgPoOrderBill"),
+                    hidden: false,
+                    name: "CgPoOrderBill",
+                    path: "cgPoOrderBill",
+                  },
+
+                ],
+              },
+              {
+                meta: {
+                  icon: "build",
+                  link: null,
+                  noCache: false,
+                  title: "鏀舵枡閫氱煡鍗�",
+                },
+                hidden: false,
+                name: "PoInStock",
+                path: "PoInStock",
+                redirect: "noRedirect",
+                component: "Layout",
+                children: [
+                  {
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "鏀舵枡閫氱煡鍗曞垪琛�",
+                    },
+                    component: () =>
+                      import("@/views/purchase/cgPoInStockBill/cgPoInStockBill.vue"),
+                    hidden: false,
+                    name: "CgPoInStockBill",
+                    path: "cgPoInStockBill",
+                  },
+                ]
+              }
+            ],
+          },
+                    {
+            alwaysShow: true,
+            component: "Layout",
+            meta: {
+              icon: "build",
+              link: null,
+              noCache: false,
+              title: "鐢熶骇绠$悊",
+            },
+            hidden: false,
+            name: "ICMO",
+            path: "/ICMO",
+            redirect: "noRedirect",
+            children: [
+              {
+                meta: {
+                  icon: "build",
+                  link: null,
+                  noCache: false,
+                  title: "鐢熶骇璁㈠崟",
+                },
+                hidden: false,
+                name: "ScIcmoBill",
+                path: "scIcmoBill",
+                redirect: "noRedirect",
+                component: "Layout",
+                children: [
+                  {
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "鐢熶骇璁㈠崟鍒楄〃",
+                    },
+                    component: () => import("@/views/ICMO/ScICMOBillList.vue"),
+                    hidden: false,
+                    name: "ScICMOBillList",
+                    path: "scICMOBillList",
+                  },
                 ],
               },
             ],
diff --git a/src/views/cgPoInStockBill/index.vue b/src/views/ICMO/ScICMOBillList.vue
similarity index 87%
copy from src/views/cgPoInStockBill/index.vue
copy to src/views/ICMO/ScICMOBillList.vue
index e057ad3..74874b4 100644
--- a/src/views/cgPoInStockBill/index.vue
+++ b/src/views/ICMO/ScICMOBillList.vue
@@ -1,51 +1,70 @@
 <template>
   <div style="padding: 10px">
-    <el-drawer title="鏌ヨ" :visible.sync="searchOpen" :with-header="false" size="650px">
-      <div style="padding: 50px; width: 630px">
-        <div class="searchText">
-          <div style="font-size: 18px">QUICK SEARCH</div>
-          <div>蹇�熸悳绱�</div>
-          <div class="searchImg"></div>
-        </div>
-        <el-form :model="queryParams" ref="queryForm" label-width="98px">
-          <el-row>
-            <el-form-item label="鑱屽憳浠g爜" prop="HNumber">
-              <el-input
-                v-model="queryParams.HNumber"
-                placeholder="璇疯緭鍏ヨ亴鍛樹唬鐮�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="鑱屽憳鍚嶇О" prop="HName">
-              <el-input
-                v-model="queryParams.HName"
-                placeholder="璇疯緭鍏ヨ亴鍛樺悕绉�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="缁勭粐">
-              <el-select
-                v-model="queryParams.HOrgID"
-                placeholder="璇烽�夋嫨"
-                class="ForFilteringSchemes"
-              >
-                <el-option
-                  v-for="(item, index) in organizationList"
-                  :key="index"
-                  :label="item.Name"
-                  :value="item.ID"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-row>
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      label-width="78px"
+      class="searchBox"
+    >
+      <el-row>
+        <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+          <el-date-picker
+            v-model="dateRange"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="鏃ユ湡闂撮殧">
+          <el-select
+            v-model="queryParams.HInitTimeCycle"
+            placeholder="璇烽�夋嫨"
+            @change="riqiChange"
+          >
+            <el-option
+              v-for="(item, index) in rqsgList"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-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="缁勭粐">
+          <el-select
+            v-model="queryParams.HOrgID"
+            placeholder="璇烽�夋嫨"
+            class="ForFilteringSchemes"
+          >
+            <el-option
+              v-for="(item, index) in organizationList"
+              :key="index"
+              :label="item.Name"
+              :value="item.ID"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-row>
+
+      <el-collapse v-model="activeSeach">
+        <el-collapse-item title="鏇村" name="1">
           <el-card class="box-card">
             <div slot="header" class="clearfix"><span>杩囨护</span></div>
             <div>
-              <el-form-item label-width="0">
-                <el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName1"
@@ -86,10 +105,10 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName2"
@@ -131,10 +150,10 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName"
@@ -174,104 +193,23 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
+                </el-form-item>
+              </el-row>
             </div>
           </el-card>
-          <el-form-item label-width="78px" style="margin-top: 50px">
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">
-              鎼� 绱�</el-button
-            >
-            <el-button icon="el-icon-circle-close" @click="searchOpen = false"
-              >鍙� 娑�</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-drawer>
-    <el-row>
-      <el-form>
-        <el-col :span="4" class="inline">
-          <el-form-item label="鏃ユ湡闂撮殧" class="form-item-inline">
-            <el-select
-              v-model="queryParams.timeSpan"
-              placeholder="璇烽�夋嫨鏃ユ湡闂撮殧"
-              @change="onDateScanOptionChangerHandler"
-            >
-              <el-option
-                v-for="(item, index) in [
-                  {
-                    label: '浠绘剰闂撮殧',
-                    value: -1,
-                  },
-                  {
-                    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: 182,
-                  },
-                  {
-                    label: '杩戜竴骞�',
-                    value: 365,
-                  },
-                ]"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="寮�濮嬫棩鏈�" class="form-item-inline">
-            <el-date-picker
-              v-model="queryParams.HBeginDate"
-              :disabled="disableDataPicker"
-              value-format="yyyy-MM-DD"
-            ></el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="缁撴潫鏃ユ湡" class="form-item-inline">
-            <el-date-picker
-              v-model="queryParams.HEndDate"
-              :disabled="disableDataPicker"
-              value-format="yyyy-MM-DD"
-            ></el-date-picker>
-          </el-form-item>
-        </el-col>
-      </el-form>
-    </el-row>
+        </el-collapse-item>
+      </el-collapse>
+
+      <el-form-item label-width="78px">
+        <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">
+          鎼� 绱�</el-button
+        >
+        <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false"
+          >鍙� 娑�</el-button
+        >
+      </el-form-item>
+    </el-form>
+
     <el-row :gutter="10" class="mb8">
       <!-- <el-col :span="1.5">
         <el-button
@@ -286,7 +224,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAddEdit((OperationType = 1))"
@@ -296,8 +233,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -307,8 +243,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -318,8 +253,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
+          type="primary"
           icon="el-icon-delete"
           size="mini"
           :disabled="single"
@@ -329,23 +263,21 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
-          @click="set_CheckBill(0, (form = rowForm))"
+          @click="set_CheckBill(1, (form = rowForm))"
           >瀹℃牳</el-button
         >
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
-          @click="set_CheckBill(1, (form = rowForm))"
+          @click="set_CheckBill(2, (form = rowForm))"
           >鍙嶅鏍�</el-button
         >
       </el-col>
@@ -373,8 +305,7 @@
       </el-col> -->
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -384,8 +315,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -395,8 +325,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -406,8 +335,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -417,8 +345,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -428,8 +355,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -440,8 +366,7 @@
 
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
@@ -450,8 +375,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleRowHide"
@@ -464,7 +388,7 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
           >閲� 缃�</el-button
         >
       </el-col>
@@ -656,22 +580,22 @@
 <script>
 import axios from "axios";
 import RowSettings from "@/views/component/rowSettings";
-import Edit from "@/views/gyEmployee/edit";
-import gySource from "@/views/gySource";
 import dayjs from "dayjs";
 
 export default {
   name: "GySource",
-  components: { RowSettings, Edit, gySource },
+  components: { RowSettings },
   props: {
     openPage: { type: String },
   },
   data() {
     return {
+      activeSeach: "",
       HModName: "Cg_POOrderBillList",
       editShow: false,
       openEdit: false,
       totalNameList: [],
+      dateRange: [],
       tableShow: true,
       openPrintList: false,
       printListShow: false,
@@ -721,7 +645,7 @@
       openData: false, //鏁版嵁寮圭獥
       dialogTitle: "",
       zuzhiId: "",
-      organizationList: [], //缁勭粐鍒楄〃
+      organizationList: JSON.parse(sessionStorage.getItem("organizationList")), //缁勭粐鍒楄〃
       subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
@@ -812,15 +736,11 @@
       uploadTotal: 0,
     };
   },
-  mounted() {
-    this.queryParams.HBeginDate = dayjs(new Date())
-      .subtract(29, "d")
-      .format("YYYY-MM-DDTHH:mm:ss");
-    this.queryParams.HEndDate = dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss");
-    this.fetchData();
+  mounted() {},
+  created() {
     this.riqiChange();
+    this.getList();
   },
-  created() {},
   methods: {
     onDateScanOptionChangerHandler(e) {
       this.queryParams.timeSpan = e;
@@ -982,14 +902,26 @@
       if (this.pageSize == 0) {
         this.pageSize = 50;
       }
+      this.queryParams.HOrgID = sessionStorage["OrganizationID"]
+
       // this.queryParams.HOrgID = 100038
       // this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
       // 鏀舵枡閫氱煡鍗曞垪琛�
-      try {
-        let res = await axios.get(this.baseURL + "Cg_POInStockBill/page", {
+      
+      if (this.dateRange.length > 0) {
+        this.sWhere +=
+          " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
+        this.sWhere +=
+          " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+      }
+      console.log()
+      let Organization = this.organizationList.find(e => e.ID = this.queryParams.HOrgID)?.Name
+      try{
+        let res = await axios.get(this.baseURL + "/Xs_SeOutStockBill/list_byPage", {
           params: {
             sWhere: this.sWhere,
             user: this.user,
+            Organization: Organization,
             page: this.page,
             size: this.pageSize,
           },
@@ -1450,7 +1382,7 @@
         .then(() => {
           if (!this.rowForm.瀹℃牳浜�) {
             axios
-              .get(this.baseURL + "Cg_POInStockBill/DeltetPOInStockBill", {
+              .get(this.baseURL + "/Xs_SeOutStockBill/DeltetSeOutStockBill", {
                 params: {
                   HInter: this.rowForm.hmainid.toString(),
                   HsupId: this.rowForm.HsupId,
@@ -1482,8 +1414,8 @@
       var InterID = form.HItemID || form.HInterID || form.hmainid;
       //閫昏緫瀹℃牳鏂规硶
       axios
-        .get(this.baseURL + "/Cg_POInStockBill/AuditCg_POInStockBill", {
-          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+        .get(this.baseURL + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
+          params: { HInterID: InterID, TypeError: num, CurUserName: this.user },
         })
         .then((res) => {
           let result = res.data;
@@ -1503,7 +1435,7 @@
       let HInterID = form.HItemID || form.HInterID || form.hmainid;
       try {
         let res = await axios.get(
-          `${this.baseURL}/Cg_POInStockBill/CloseCg_POInStockBill`,
+          `${this.baseURL}/Xs_SeOutStockBill/CloseXs_SeOutStockBill`,
           {
             params: {
               HInterID: HInterID,
@@ -1530,7 +1462,7 @@
       let HEntryID = form.HEntryID || form.hsubid;
       try {
         let res = await axios.get(
-          `${this.baseURL}/Cg_POInStockBill/CloseRowCg_POInStockBill`,
+          `${this.baseURL}/Xs_SeOutStockBill/CloseRowXs_SeOutStockBill`,
           {
             params: {
               HInterID: HInterID,
@@ -1557,7 +1489,7 @@
       let HInterID = form.HItemID || form.HInterID || form.hmainid;
       try {
         let res = await axios.get(
-          `${this.baseURL}/Cg_POInStockBill/DropCg_POInStockBill`,
+          `${this.baseURL}/Xs_SeOutStockBill/CancellXs_SeOutStockBill`,
           {
             params: {
               HInterID: HInterID,
diff --git a/src/views/gyEmployee/index.vue b/src/views/basic/gyEmployee/gyEmployee.vue
similarity index 94%
rename from src/views/gyEmployee/index.vue
rename to src/views/basic/gyEmployee/gyEmployee.vue
index 3c0bc20..f54ae10 100644
--- a/src/views/gyEmployee/index.vue
+++ b/src/views/basic/gyEmployee/gyEmployee.vue
@@ -1,46 +1,55 @@
 <template>
   <div style="padding: 10px">
-    <el-drawer title="鏌ヨ" :visible.sync="searchOpen" :with-header="false" size="650px">
-      <div style="padding: 50px; width: 630px">
-        <div class="searchText">
-          <div style="font-size: 18px">QUICK SEARCH</div>
-          <div>蹇�熸悳绱�</div>
-          <div class="searchImg"></div>
-        </div>
-        <el-form :model="queryParams" ref="queryForm" label-width="98px">
-          <el-row>
-            <el-form-item label="鑱屽憳浠g爜" prop="HNumber">
-              <el-input
-                v-model="queryParams.HNumber"
-                placeholder="璇疯緭鍏ヨ亴鍛樹唬鐮�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="鑱屽憳鍚嶇О" prop="HName">
-              <el-input
-                v-model="queryParams.HName"
-                placeholder="璇疯緭鍏ヨ亴鍛樺悕绉�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="缁勭粐">
-              <el-select
-                v-model="queryParams.HOrgID"
-                placeholder="璇烽�夋嫨"
-                class="ForFilteringSchemes"
-              >
-                <el-option
-                  v-for="(item, index) in organizationList"
-                  :key="index"
-                  :label="item.Name"
-                  :value="item.ID"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-row>
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      label-width="98px"
+      :inline="true"
+      class="searchBox"
+    >
+      <el-row>
+        <el-form-item label="鑱屽憳浠g爜" prop="HNumber">
+          <el-input
+            v-model="queryParams.HNumber"
+            placeholder="璇疯緭鍏ヨ亴鍛樹唬鐮�"
+            @keyup.enter.native="handleQuery"
+            class="ForFilteringSchemes"
+          />
+        </el-form-item>
+        <el-form-item label="鑱屽憳鍚嶇О" prop="HName">
+          <el-input
+            v-model="queryParams.HName"
+            placeholder="璇疯緭鍏ヨ亴鍛樺悕绉�"
+            @keyup.enter.native="handleQuery"
+            class="ForFilteringSchemes"
+          />
+        </el-form-item>
+        <el-form-item label="缁勭粐">
+          <el-select
+            v-model="queryParams.HOrgID"
+            placeholder="璇烽�夋嫨"
+            class="ForFilteringSchemes"
+          >
+            <el-option
+              v-for="(item, index) in organizationList"
+              :key="index"
+              :label="item.Name"
+              :value="item.ID"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-row>
+      <el-form-item label-width="78px">
+        <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">
+          鎼� 绱�</el-button
+        >
+        <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false"
+          >鍙� 娑�</el-button
+        >
+      </el-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>
@@ -178,17 +187,9 @@
               </el-form-item>
             </div>
           </el-card>
-          <el-form-item label-width="78px" style="margin-top: 50px">
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">
-              鎼� 绱�</el-button
-            >
-            <el-button icon="el-icon-circle-close" @click="searchOpen = false"
-              >鍙� 娑�</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-drawer>
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
     <el-row :gutter="10" class="mb8">
       <!-- <el-col :span="1.5">
         <el-button
@@ -203,7 +204,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAddEdit((OperationType = 1))"
@@ -213,8 +213,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -224,8 +223,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -235,8 +233,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
+          type="primary"
           icon="el-icon-delete"
           size="mini"
           :disabled="single"
@@ -246,8 +243,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -257,8 +253,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -268,8 +263,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -279,8 +273,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -290,8 +283,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
@@ -300,8 +292,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleRowHide"
@@ -506,8 +497,8 @@
 <script>
 import axios from "axios";
 import RowSettings from "@/views/component/rowSettings";
-import Edit from "@/views/gyEmployee/edit";
-import gySource from "@/views/gySource";
+import Edit from "@/views/basic/gyEmployee/gyEmployeeEdit";
+import gySource from "@/views/basic/gySource";
 import { env } from "echarts";
 
 export default {
diff --git a/src/views/gyEmployee/edit/index.vue b/src/views/basic/gyEmployee/gyEmployeeEdit.vue
similarity index 100%
rename from src/views/gyEmployee/edit/index.vue
rename to src/views/basic/gyEmployee/gyEmployeeEdit.vue
diff --git a/src/views/basic/gySource/index.vue b/src/views/basic/gySource/index.vue
index 993a12a..e09ac1b 100644
--- a/src/views/basic/gySource/index.vue
+++ b/src/views/basic/gySource/index.vue
@@ -386,7 +386,7 @@
       if (this.pageSize == 0) {
         this.pageSize = 50
       }
-      this.queryParams.HOrgID = sessionStorage["OrganizationID"]-0
+      this.queryParams.HOrgID = sessionStorage["OrganizationID"]
       this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'"
       //鐢熶骇璧勬枡鍒楄〃
       axios.get(this.baseURL + '/Gy_Source/list_byPage', {
diff --git a/src/views/gyStockPlace/index.vue b/src/views/basic/gyStockPlace/gyStockPlace.vue
similarity index 93%
rename from src/views/gyStockPlace/index.vue
rename to src/views/basic/gyStockPlace/gyStockPlace.vue
index a3c1b79..dce87f3 100644
--- a/src/views/gyStockPlace/index.vue
+++ b/src/views/basic/gyStockPlace/gyStockPlace.vue
@@ -1,54 +1,64 @@
 <template>
   <div style="padding: 10px">
-    <el-drawer title="鏌ヨ" :visible.sync="searchOpen" :with-header="false" size="650px">
-      <div style="padding: 50px; width: 630px">
-        <div class="searchText">
-          <div style="font-size: 18px">QUICK SEARCH</div>
-          <div>蹇�熸悳绱�</div>
-          <div class="searchImg"></div>
-        </div>
-        <el-form :model="queryParams" ref="queryForm" label-width="98px">
-          <el-row>
-            <el-form-item label="浠撲綅浠g爜" prop="HNumber">
-              <el-input
-                v-model="queryParams.HNumber"
-                placeholder="璇疯緭鍏ヤ粨浣嶄唬鐮�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="浠撲綅鍚嶇О" prop="HName">
-              <el-input
-                v-model="queryParams.HName"
-                placeholder="璇疯緭鍏ヤ粨浣嶅悕绉�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="缁勭粐">
-              <el-select
-                v-model="queryParams.HOrgName"
-                placeholder="璇烽�夋嫨"
-                class="ForFilteringSchemes"
-              >
-                <el-option
-                  v-for="(item, index) in organizationList"
-                  :key="index"
-                  :label="item.Name"
-                  :value="item.Name"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="鍚屾" class="wh-sync">
-              <el-input
-                v-model="queryParams.HSyncNumber"
-                placeholder="璇疯緭鍏ヤ粨浣嶄唬鐮�"
-                @keyup.enter.native="handleSync"
-              />
-              <el-button @click="handleSync">鍚屾</el-button>
-            </el-form-item>
-          </el-row>
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      label-width="98px"
+      :inline="true"
+      class="searchBox"
+    >
+      <el-row>
+        <el-form-item label="浠撲綅浠g爜" prop="HNumber">
+          <el-input
+            v-model="queryParams.HNumber"
+            placeholder="璇疯緭鍏ヤ粨浣嶄唬鐮�"
+            @keyup.enter.native="handleQuery"
+            class="ForFilteringSchemes"
+          />
+        </el-form-item>
+        <el-form-item label="浠撲綅鍚嶇О" prop="HName">
+          <el-input
+            v-model="queryParams.HName"
+            placeholder="璇疯緭鍏ヤ粨浣嶅悕绉�"
+            @keyup.enter.native="handleQuery"
+            class="ForFilteringSchemes"
+          />
+        </el-form-item>
+        <el-form-item label="缁勭粐">
+          <el-select
+            v-model="queryParams.HOrgName"
+            placeholder="璇烽�夋嫨"
+            class="ForFilteringSchemes"
+          >
+            <el-option
+              v-for="(item, index) in organizationList"
+              :key="index"
+              :label="item.Name"
+              :value="item.Name"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="鍚屾" :inline="true">
+          <el-input
+            v-model="queryParams.HSyncNumber"
+            placeholder="璇疯緭鍏ヤ粨浣嶄唬鐮�"
+            @keyup.enter.native="handleSync"
+          >
+            <el-button slot="append" @click="handleSync">鍚屾</el-button>
+          </el-input>
+        </el-form-item>
+      </el-row>
+      <el-form-item label-width="78px">
+        <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">
+          鎼� 绱�</el-button
+        >
+        <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false"
+          >鍙� 娑�</el-button
+        >
+      </el-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>
@@ -186,22 +196,13 @@
               </el-form-item>
             </div>
           </el-card>
-          <el-form-item label-width="78px" style="margin-top: 50px">
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">
-              鎼� 绱�</el-button
-            >
-            <el-button icon="el-icon-circle-close" @click="searchOpen = false"
-              >鍙� 娑�</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-drawer>
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAddEdit((OperationType = 1))"
@@ -211,8 +212,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -222,8 +222,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
+          type="primary"
           icon="el-icon-delete"
           size="mini"
           :disabled="single"
@@ -233,8 +232,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
@@ -243,8 +241,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleRowHide"
@@ -257,7 +254,7 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
           >閲� 缃�</el-button
         >
       </el-col>
@@ -418,8 +415,8 @@
 <script>
 import axios from "axios";
 import RowSettings from "@/views/component/rowSettings";
-import Edit from "@/views/gyStockPlace/edit";
-import GyStockPlace from "@/views/gyStockPlace";
+import Edit from "@/views/basic/gyStockPlace/gyStockPlaceEdit";
+import GyStockPlace from "@/views/basic/gyStockPlace/gyStockPlace";
 
 export default {
   name: "GyStockPlace",
diff --git a/src/views/gyStockPlace/edit/index.vue b/src/views/basic/gyStockPlace/gyStockPlaceEdit.vue
similarity index 100%
rename from src/views/gyStockPlace/edit/index.vue
rename to src/views/basic/gyStockPlace/gyStockPlaceEdit.vue
diff --git a/src/views/basic/gyWarehouse/edit/index.vue b/src/views/basic/gyWarehouse/edit/index.vue
deleted file mode 100644
index a49f3c7..0000000
--- a/src/views/basic/gyWarehouse/edit/index.vue
+++ /dev/null
@@ -1,616 +0,0 @@
-<template>
-  <div v-loading="formLoading" v-if="formShow">
-    <div style="margin-bottom: 10px; border-bottom: 1px solid #f6f6f6">
-      <el-button type="primary" @click="submitForm" :disabled="subDisabled"
-        >淇� 瀛�</el-button
-      >
-      <el-button
-        type="primary"
-        @click="set_CheckBill(0, form)"
-        :disabled="CheckBillDisabled"
-        >瀹� 鏍�</el-button
-      >
-      <el-button type="primary" @click="close">閫� 鍑�</el-button>
-    </div>
-    <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-      <el-tabs v-model="activeName" type="card">
-        <el-tab-pane label="鍩烘湰淇℃伅" name="first">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="浠撳簱浠g爜" prop="HNumber">
-                <el-input v-model="form.HNumber" placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="浠撳簱鍚嶇О" prop="HName">
-                <el-input v-model="form.HName" placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="鍔╄鐮�" prop="HHelpCode">
-                <el-input v-model="form.HHelpCode" placeholder="璇疯緭鍏ュ姪璁扮爜"> </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="浠撳簱鍦板潃" prop="HAddress">
-                <el-input v-model="form.HAddress" placeholder="璇疯緭鍏ヤ粨搴撳湴鍧�" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="鑱旂郴鐢佃瘽" prop="HPhone">
-                <el-input v-model="form.HPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="浠撳簱绫诲瀷" prop="HWarehouseType">
-                <el-select v-model="form.HWarehouseType" placeholder="璇烽�夋嫨浠撳簱绫诲瀷">
-                  <el-option
-                    v-for="(item, index) in HWarehouseTypeList"
-                    :key="index"
-                    :label="item.Name"
-                    :value="item.Name"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="绂佺敤鏍囧織" prop="HStopflag">
-                <el-checkbox v-model="form.HStopflag" disabled>鏄惁绂佺敤</el-checkbox>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="鍚敤浠撲綅" prop="HSPFlag">
-                <el-checkbox v-model="form.HSPFlag">鏄惁鍚敤</el-checkbox>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="璐熷簱瀛樻帶鍒舵爣璁�" prop="HStockCtrlFlag">
-                <el-checkbox v-model="form.HStockCtrlFlag">鏄惁鍚敤</el-checkbox>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="缁勭粐" prop="HUSEORGID">
-                <el-select
-                  v-model="form.HUSEORGID"
-                  placeholder="璇烽�夋嫨缁勭粐"
-                  :disabled="zzSelDis"
-                >
-                  <el-option
-                    v-for="(item, index) in organizationList"
-                    :key="index"
-                    :label="item.Name"
-                    :value="item.ID"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-tab-pane>
-        <el-tab-pane label="鍏朵粬淇℃伅" name="second">
-          <el-row>
-            <el-col :span="16">
-              <el-form-item class="form-inline" label="澶囨敞" prop="HRemark">
-                <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�..."></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item class="form-inline" label="浠撳簱绠$悊鍛�" prop="HEmpName">
-                <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨浠撳簱绠$悊鍛�">
-                  <el-button
-                    slot="append"
-                    icon="el-icon-search"
-                    @click="openDataDialog(1)"
-                  ></el-button>
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-tab-pane>
-        <el-tab-pane label="鍒跺崟淇℃伅" name="third">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="鍒涘缓浜�" prop="HMakeEmp">
-                <el-input v-model="form.HMakeEmp" placeholder="璇疯緭鍏ュ垱寤轰汉" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="绂佺敤浜�" prop="HStopEmp">
-                <el-input v-model="form.HStopEmp" placeholder="璇疯緭鍏ョ鐢ㄤ汉" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="瀹℃牳浜�" prop="HCheckEmp">
-                <el-input v-model="form.HCheckEmp" placeholder="璇疯緭鍏ュ鏍镐汉" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="鍒涘缓鏃ユ湡" prop="HMakeDate">
-                <el-date-picker
-                  v-model="form.HMakeDate"
-                  type="date"
-                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
-                  disabled
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="绂佺敤鏃ユ湡" prop="HStopTime">
-                <el-date-picker
-                  v-model="form.HStopTime"
-                  type="date"
-                  placeholder="閫夋嫨绂佺敤鏃ユ湡"
-                  disabled
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckTime">
-                <el-date-picker
-                  v-model="form.HCheckTime"
-                  type="date"
-                  placeholder="閫夋嫨瀹℃牳鏃ユ湡"
-                  disabled
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-tab-pane>
-      </el-tabs>
-    </el-form>
-    <!-- 閮ㄩ棬寮圭獥 -->
-    <el-dialog
-      :title="dialogTitle"
-      :visible.sync="openData"
-      width="1280px"
-      append-to-body
-    >
-      <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
-      <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
-      <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
-      <GyWorkCenter @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="workCenterShow" />
-      <Employee
-        @deptEmitDb="dbEmitData"
-        @deptEmit="emitData"
-        v-if="employeeShow"
-      ></Employee>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
-        <el-button @click="deptClose">鍙� 娑�</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import axios from "axios";
-import Dept from "@/views/component/dept";
-import Warehouse from "@/views/component/warehouse";
-import Material from "@/views/component/material";
-import RowSettings from "@/views/component/rowSettings";
-import GyWorkCenter from "@/views/component/gyWorkCenter";
-import Employee from "@/views/component/employee";
-import moment from "moment";
-import dayjs from "dayjs";
-
-export default {
-  name: "gyWarehouse_Edit",
-  components: { Dept, Warehouse, Material, RowSettings, GyWorkCenter, Employee },
-  props: {
-    OperationType: { type: Number },
-    linterid: { type: Number },
-    HSouceBillType: { type: String },
-    copyType: { type: Number },
-  },
-  data() {
-    return {
-      formShow: false,
-      temp: undefined,
-      formLoading: true,
-      zzSelDis: false,
-      rowHideShow: false,
-      openRowHide: false,
-      workCenterShow: false,
-      sWhere: "",
-      sTime: "",
-      eTime: "",
-      zbIndex: null,
-      dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
-      deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢
-      warehouseShow: false, //浠撳簱鏁版嵁缁勪欢
-      materialShow: false, //鐗╂枡鏁版嵁缁勪欢
-      employeeShow: false, // 浠撳簱绠$悊鍛樼粍浠�
-      deptform: {}, //寮圭獥閫変腑鏁版嵁
-      openData: false, //鏁版嵁寮圭獥
-      dialogTitle: "",
-      zuzhiId: 0,
-      organizationList: [], //缁勭粐鍒楄〃
-      subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
-      CheckBillDisabled: true,
-      // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
-      HInterID: null,
-      baseURL: process.env.VUE_APP_BASE_URL || "http://47.96.97.237/API/",
-      user: "admin",
-      currentRow: [],
-      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
-      lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
-      selectedRow: null, // 褰撳墠閫変腑鐨勮
-      rowForm: {},
-      checkedSysZb: [],
-      editData: [], //瀛愯〃
-      editBtData: [], //瀛愯〃琛ㄥご
-      activeName: "first",
-      searchOpen: false,
-      // 寮瑰嚭灞傛爣棰�
-      title: "",
-      // 鏄惁鏄剧ず寮瑰嚭灞�
-      open: false,
-      // 鏄剧ず鎼滅储鏉′欢
-      showSearch: true,
-      // 閫変腑鏁扮粍
-      ids: [],
-
-      // 琛ㄥ崟鍙傛暟
-      form: {
-        HWarehouseType: "鐢熶骇浠撳簱",
-      },
-      // 琛ㄥ崟鏍¢獙
-      rules: {
-        HNumber: [{ required: true, message: "浠撳簱浠g爜涓嶈兘涓虹┖", trigger: "blur" }],
-        HName: [{ required: true, message: "浠撳簱鍚嶇О鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
-        HWarehouseType: [
-          { required: true, message: "浠撳簱绫诲瀷涓嶈兘涓虹┖", trigger: "blur" },
-        ],
-      },
-
-      HWarehouseTypeList: [
-        {
-          Name: "鐢熶骇浠撳簱",
-        },
-        {
-          Name: "妯″叿浠撳簱",
-        },
-      ],
-    };
-  },
-  created() {
-    this.reset();
-    this.fetchData();
-  },
-  activated() {
-    this.reset();
-    this.fetchData();
-  },
-  methods: {
-    fetchData() {
-      //鐧诲綍鐢ㄦ埛淇℃伅
-      axios
-        .get(
-          "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
-        )
-        .then((response) => {
-          let data = response.data.data[0];
-          this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
-          this.user = data.Czymc;
-          axios
-            .get(this.baseURL + "/Web/GetOrganizations", {})
-            .then((response) => {
-              if (response.data.count == 1) {
-                this.organizationList = response.data.data; //缁勭粐鍒楄〃
-                this.getdata();
-              }
-            })
-            .catch((error) => {
-              this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-            });
-        })
-        .catch((error) => {
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-        });
-    },
-    getdata() {
-      this.reset();
-      console.log(this.OperationType);
-      if (this.OperationType != 1) {
-        this.zzSelDis = true;
-        axios
-          .get(this.baseURL + "/Gy_Warehouse/cx", {
-            params: {
-              HInterID: this.linterid,
-            },
-          })
-          .then((response) => {
-            console.log(response);
-            let result = response.data;
-            if (result.code == 1) {
-              // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-              var data = result.data[0];
-
-              Object.assign(this.form, {
-                HNumber: data.浠撳簱浠g爜,
-                HItemID: data.HItemID,
-                HParentID: data.HParentID,
-                HShortNumber: data.HNumber,
-                HName: data.浠撳簱鍚嶇О,
-                HHelpCode: data.HHelpCode,
-                HEmpID: data.HEmpID,
-                HEmpName: data.HEmpName,
-                HAddress: data.浠撳簱鍦板潃,
-                HPhone: data.鑱旂郴鐢佃瘽,
-                HStopflag: data.绂佺敤鏍囪,
-                HStockCtrlFlag: data.璐熷簱瀛樻帶鍒舵爣璁�,
-                HSPFlag: data.鍚敤浠撲綅 == "Y" ? 1 : 0,
-                HRemark: data.HRemark,
-                HWarehouseType: data.浠撳簱绫诲瀷,
-                //, "HItemID": data.鏉$爜缂栧彿
-                HBarCode: data.HBarCode,
-                HUSEORGID: data.HUSEORGID,
-                //, "HCreator": data.鍒涘缓浜�
-                //, "lngBillKey": data.lngBillKey
-                //, "lngBillSubKey": data.lngBillSubKey
-                //, "HMaker": data.HMaker
-                //, "HCreateDate": data.鍒涘缓鏃ユ湡
-                HUpDater: sessionStorage["HUserName"],
-                HMakeEmp: data["鍒涘缓浜�"],
-                HMakeDate:
-                  data["鍒涘缓鏃ユ湡"] == null
-                    ? ""
-                    : dayjs(new Date(data["鍒涘缓鏃ユ湡"])).format("yyyy-MM-dd"),
-                HCheckEmp: data["瀹℃牳浜�"],
-                HCheckDate:
-                  data["瀹℃牳鏃ユ湡"] == null
-                    ? ""
-                    : dayjs(new Date(data["瀹℃牳鏃ユ湡"])).format("yyyy-MM-dd"),
-                HStopEmp: data["绂佺敤浜�"],
-                HStopDate:
-                  data["绂佺敤鏃ユ湡"] == null
-                    ? ""
-                    : dayjs(new Date(data["绂佺敤鏃ユ湡"])).format("yyyy-MM-dd"),
-              });
-              if (!data.HCheckEmp) {
-                this.CheckBillDisabled = false;
-              }
-            }
-            this.$nextTick(() => {
-              this.formShow = true;
-              this.formLoading = false;
-            });
-          })
-          .catch((error) => {
-            this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-          });
-      } else if (this.OperationType == 1) {
-        let date = new Date();
-        this.form.HMakeDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
-        this.$nextTick(() => {
-          this.formShow = true;
-          this.formLoading = false;
-        });
-      }
-    },
-    handleRowHide() {
-      this.rowHideShow = true;
-      this.openRowHide = true;
-    },
-    rowSetClose(val) {
-      this.rowHideShow = false;
-      this.openRowHide = val;
-    },
-    organizationChange(val) {
-      // let options=undefined
-      //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
-    },
-    //閮ㄩ棬寮圭獥璧嬪��
-    dbEmitData(deptRow, num) {
-      console.log(deptRow, num);
-      // num=1 浠撳簱绠$悊鍛�
-      if (num == 1) {
-        this.form.HEmpID = deptRow.HItemID;
-        this.form.HEmpName = deptRow["鑱屽憳鍚嶇О"];
-        this.openData = false;
-      }
-    },
-    emitData(deptRow, num) {
-      this.dialogTypeNum = num;
-      this.deptform = deptRow;
-    },
-    deptClickSub() {
-      this.dbEmitData(this.deptform, this.dialogTypeNum);
-      this.deptform = {};
-    },
-    deptClose() {
-      this.deptform = {};
-      this.openData = false;
-    },
-
-    //鏂板缂栬緫琛ㄥ崟鍒濆鍖�
-    reset() {
-      this.form = {
-        HNumber: null,
-        HItemID: 0,
-        HName: null,
-        HHelpCode: null,
-        HWorkTimes: "0",
-        HMaxWorkTimes: "0",
-        HRelationID: "0",
-        HMinAdd: "0",
-        HClassCount: "0",
-        HOverTimes: "0",
-        HCenter: null,
-        HCenterID: null,
-        HGroup: null,
-        HGroupID: 0,
-        HDeptName: null,
-        HDeptID: 0,
-        HProcName: null,
-        HProcID: 0,
-        HProcNumber: null,
-        HStopflag: false,
-        HType: null,
-        HRemark: null,
-        HUseFlag: "鏈娴�",
-        HUSEORGID: this.zuzhiId,
-        HCREATEORGID: this.zuzhiId,
-        HMacAddr: null,
-        HEmpID: 0,
-        HEmpName: null,
-        HMakeEmp: this.user,
-        HMakeTime: null,
-        HStopEmp: null,
-        HStopTime: null,
-        HCheckEmp: null,
-        HCheckTime: null,
-        HPrimarySourceID: 0,
-        HPrimarySourceName: null,
-        HParentID: 0,
-        HCubicleQty: "1",
-        HProdLinePeopleNum: "0",
-      };
-      this.editData = [];
-      this.editBtData = [];
-      this.ids = [];
-      this.formShow = false;
-      this.subDisabled = false;
-      this.formLoading = true;
-      this.CheckBillDisabled = true;
-      this.activeName = "first";
-      this.resetForm("form");
-    },
-    //閫�鍑�
-    close() {
-      this.reset();
-      this.formShow = false;
-      // console.log()
-      this.$emit("editCloseGy", 0);
-    },
-    // 缂栬緫鎻愪氦淇濆瓨
-    submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          let fhck = false;
-          this.$nextTick(() => {
-            if (!fhck) {
-              console.log(4);
-              var sMainStr = JSON.stringify(this.form);
-              // var sSubStr = JSON.stringify(this.editData);
-              var sMainSub = sMainStr + ";" + this.user;
-              axios({
-                method: "post",
-                url: this.baseURL + "/Gy_Warehouse/ModifyByID",
-                data: {
-                  oMain: sMainSub,
-                },
-              })
-                .then((response) => {
-                  console.log(response);
-                  if (response.data.count == 1) {
-                    this.subDisabled = true; //璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
-                    this.CheckBillDisabled = false;
-                    this.$modal.msgSuccess(response.data.Message);
-                  } else {
-                    this.$modal.msgError(response.data.Message);
-                    this.CheckBillDisabled = false;
-                    this.subDisabled = false; //璁剧疆淇濆瓨鎸夐挳鍙敤
-                  }
-                })
-                .catch((error) => {
-                  this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-                });
-            }
-          });
-        }
-      });
-    },
-
-    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-    handleDelete() {
-      this.$modal
-        .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
-        .then(() => {
-          if (this.rowForm.鐘舵�� == "鍒涘缓") {
-            axios
-              .get(this.baseURL + "/Kf_SellOutBill/DeltetSellOutBill", {
-                params: { HInterID: this.rowForm.hmainid.toString(), user: this.user },
-              })
-              .then((response) => {
-                if (response.data.count == 1) {
-                  this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-                } else {
-                  this.$modal.msgError("閿欒:" + result.code + result.Message);
-                }
-              })
-              .catch((error) => {
-                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-              });
-          } else {
-            this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
-          }
-        })
-        .catch(() => {});
-    },
-    // 鍙嶅鏍�/瀹℃牳鏁版嵁
-    set_CheckBill(num, form) {
-      var InterID = form.HItemID || form.HInterID;
-      //閫昏緫瀹℃牳鏂规硶
-      axios
-        .get(this.baseURL + "/Gy_Warehouse/AuditGy_Warehouse", {
-          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
-        })
-        .then((response) => {
-          let result = response.data;
-          if (result.code == 1) {
-            this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
-            this.CheckBillDisabled = true;
-          } else {
-            this.$modal.msgError("閿欒:" + result.code + result.Message);
-          }
-        })
-        .catch((error) => {
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-        });
-    },
-    showReset() {
-      this.deptShow = false;
-      this.warehouseShow = false;
-      this.materialShow = false;
-      this.workCenterShow = false;
-    },
-    //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
-    openDataDialog(num, row) {
-      if (row) {
-        this.zbIndex = row.index - 1;
-      }
-      this.showReset();
-      if (num == 1) {
-        this.dialogTitle = "浠撳簱绠$悊鍛樺垪琛�";
-        this.employeeShow = true;
-        this.openData = true;
-      }
-    },
-  },
-};
-</script>
-<style>
-.xsckdBox .el-date-editor.el-input {
-  width: 100%;
-}
-
-.form-inline > .el-form-item__content {
-  display: flex;
-  flex-direction: row;
-}
-</style>
diff --git a/src/views/basic/gyWarehouse/index.vue b/src/views/basic/gyWarehouse/gyWarehouse.vue
similarity index 93%
rename from src/views/basic/gyWarehouse/index.vue
rename to src/views/basic/gyWarehouse/gyWarehouse.vue
index 6c5f950..3402ae3 100644
--- a/src/views/basic/gyWarehouse/index.vue
+++ b/src/views/basic/gyWarehouse/gyWarehouse.vue
@@ -1,54 +1,58 @@
 <template>
   <div style="padding: 10px">
-    <el-drawer title="鏌ヨ" :visible.sync="searchOpen" :with-header="false" size="650px">
-      <div style="padding: 50px; width: 630px">
-        <div class="searchText">
-          <div style="font-size: 18px">QUICK SEARCH</div>
-          <div>蹇�熸悳绱�</div>
-          <div class="searchImg"></div>
-        </div>
-        <el-form :model="queryParams" ref="queryForm" label-width="98px">
-          <el-row>
-            <el-form-item label="浠撳簱浠g爜" prop="HNumber">
-              <el-input
-                v-model="queryParams.HNumber"
-                placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="浠撳簱鍚嶇О" prop="HName">
-              <el-input
-                v-model="queryParams.HName"
-                placeholder="璇疯緭鍏ヤ粨搴撳悕绉�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="缁勭粐">
-              <el-select
-                v-model="queryParams.HOrgName"
-                placeholder="璇烽�夋嫨"
-                class="ForFilteringSchemes"
-              >
-                <el-option
-                  v-for="(item, index) in organizationList"
-                  :key="index"
-                  :label="item.Name"
-                  :value="item.Name"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="鍚屾" class="wh-sync">
-              <el-input
-                v-model="queryParams.HSyncNumber"
-                placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
-                @keyup.enter.native="handleSync"
-              />
-              <el-button @click="handleSync">鍚屾</el-button>
-            </el-form-item>
-          </el-row>
+    <el-form :model="queryParams" ref="queryForm" label-width="98px" :inline="true" class="searchBox">
+      <el-row>
+        <el-form-item label="浠撳簱浠g爜" prop="HNumber">
+          <el-input
+            v-model="queryParams.HNumber"
+            placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
+            @keyup.enter.native="handleQuery"
+            class="ForFilteringSchemes"
+          />
+        </el-form-item>
+        <el-form-item label="浠撳簱鍚嶇О" prop="HName">
+          <el-input
+            v-model="queryParams.HName"
+            placeholder="璇疯緭鍏ヤ粨搴撳悕绉�"
+            @keyup.enter.native="handleQuery"
+            class="ForFilteringSchemes"
+          />
+        </el-form-item>
+        <el-form-item label="缁勭粐">
+          <el-select
+            v-model="queryParams.HOrgName"
+            placeholder="璇烽�夋嫨"
+            class="ForFilteringSchemes"
+          >
+            <el-option
+              v-for="(item, index) in organizationList"
+              :key="index"
+              :label="item.Name"
+              :value="item.Name"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="鍚屾" :inline="true">
+          <el-input
+            v-model="queryParams.HSyncNumber"
+            placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
+            @keyup.enter.native="handleSync"
+          >
+            <el-button slot="append" type="primary" @click="handleSync">鍚屾</el-button>
+          </el-input>
+        </el-form-item>
+      </el-row>
+      <el-form-item label-width="78px">
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">
+          鎼� 绱�</el-button
+        >
+        <el-button icon="el-icon-circle-close" size="mini" @click="searchOpen = false"
+          >鍙� 娑�</el-button
+        >
+      </el-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>
@@ -186,22 +190,14 @@
               </el-form-item>
             </div>
           </el-card>
-          <el-form-item label-width="78px" style="margin-top: 50px">
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">
-              鎼� 绱�</el-button
-            >
-            <el-button icon="el-icon-circle-close" @click="searchOpen = false"
-              >鍙� 娑�</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-drawer>
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
+
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleImport"
@@ -211,7 +207,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAddEdit((OperationType = 1))"
@@ -221,8 +216,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -232,8 +226,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -243,8 +236,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
+          type="primary"
           icon="el-icon-delete"
           size="mini"
           :disabled="single"
@@ -254,8 +246,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -265,8 +256,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -276,8 +266,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -287,8 +276,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -298,8 +286,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
@@ -308,8 +295,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleRowHide"
@@ -322,7 +308,7 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
           >閲� 缃�</el-button
         >
       </el-col>
@@ -483,11 +469,12 @@
 <script>
 import axios from "axios";
 import RowSettings from "@/views/component/rowSettings";
-import Edit from "@/views/basic/gyWarehouse/edit";
+import Edit from "@/views/basic/gyWarehouse/gyWarehouseEdit";
+import gyWarehouse from "@/views/basic/gyWarehouse/gyWarehouse";
 
 export default {
   name: "GyWarehouse",
-  components: { RowSettings, Edit },
+  components: { RowSettings, Edit, gyWarehouse },
   props: {
     openPage: { type: String },
   },
@@ -633,7 +620,7 @@
     };
   },
   created() {
-    this.fetchData();
+    this.getList();
     this.riqiChange();
   },
   methods: {
@@ -1441,9 +1428,8 @@
   width: 100%;
 }
 
-.wh-sync > .el-form-item__content {
+.form-item-inline > .el-form-item__content {
   display: flex;
   flex-direction: row;
-  width: 60%;
 }
 </style>
diff --git a/src/views/gyWarehouse/edit/index.vue b/src/views/basic/gyWarehouse/gyWarehouseEdit.vue
similarity index 100%
rename from src/views/gyWarehouse/edit/index.vue
rename to src/views/basic/gyWarehouse/gyWarehouseEdit.vue
diff --git a/src/views/gyWarehouse/index.vue b/src/views/gyWarehouse/index.vue
deleted file mode 100644
index c2a11f4..0000000
--- a/src/views/gyWarehouse/index.vue
+++ /dev/null
@@ -1,1450 +0,0 @@
-<template>
-  <div style="padding: 10px">
-    <el-drawer title="鏌ヨ" :visible.sync="searchOpen" :with-header="false" size="650px">
-      <div style="padding: 50px; width: 630px">
-        <div class="searchText">
-          <div style="font-size: 18px">QUICK SEARCH</div>
-          <div>蹇�熸悳绱�</div>
-          <div class="searchImg"></div>
-        </div>
-        <el-form :model="queryParams" ref="queryForm" label-width="98px">
-          <el-row>
-            <el-form-item label="浠撳簱浠g爜" prop="HNumber">
-              <el-input
-                v-model="queryParams.HNumber"
-                placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="浠撳簱鍚嶇О" prop="HName">
-              <el-input
-                v-model="queryParams.HName"
-                placeholder="璇疯緭鍏ヤ粨搴撳悕绉�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="缁勭粐">
-              <el-select
-                v-model="queryParams.HOrgName"
-                placeholder="璇烽�夋嫨"
-                class="ForFilteringSchemes"
-              >
-                <el-option
-                  v-for="(item, index) in organizationList"
-                  :key="index"
-                  :label="item.Name"
-                  :value="item.Name"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="鍚屾" class="wh-sync">
-              <el-input
-                v-model="queryParams.HSyncNumber"
-                placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
-                @keyup.enter.native="handleSync"
-              />
-              <el-button @click="handleSync">鍚屾</el-button>
-            </el-form-item>
-          </el-row>
-          <el-card class="box-card">
-            <div slot="header" class="clearfix"><span>杩囨护</span></div>
-            <div>
-              <el-form-item label-width="0">
-                <el-row>
-                  <el-col :span="7">
-                    <el-select
-                      v-model="queryParams.ColName1"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
-                      <span v-for="(item, index) in btList" :key="index">
-                        <el-option
-                          :label="item.field"
-                          :value="item.field"
-                          v-if="!item.hide"
-                        ></el-option>
-                      </span>
-                    </el-select>
-                  </el-col>
-                  <el-col :span="6" style="padding: 0 10px">
-                    <el-select
-                      v-model="queryParams.Comparator1"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
-                      <el-option
-                        v-for="(item, index) in comparatorList"
-                        :key="index"
-                        :label="item.label"
-                        :value="item.value"
-                      ></el-option>
-                    </el-select>
-                  </el-col>
-                  <el-col :span="11">
-                    <el-input
-                      v-model="queryParams.ColContent1"
-                      placeholder="璇疯緭鍏�"
-                      clearable
-                      @keyup.enter.native="handleQuery"
-                      class="ForFilteringSchemes"
-                    />
-                  </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
-                  <el-col :span="7">
-                    <el-select
-                      v-model="queryParams.ColName2"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
-                      <span v-for="(item, index) in btList" :key="index">
-                        <el-option
-                          :label="item.field"
-                          :value="item.field"
-                          v-if="!item.hide"
-                        ></el-option>
-                      </span>
-                    </el-select>
-                  </el-col>
-                  <el-col :span="6" style="padding: 0 10px">
-                    <el-select
-                      v-model="queryParams.Comparator2"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
-                      <span v-for="(item, index) in comparatorList" :key="index">
-                        <el-option
-                          :label="item.label"
-                          :value="item.value"
-                          v-if="!item.hide"
-                        ></el-option>
-                      </span>
-                    </el-select>
-                  </el-col>
-                  <el-col :span="11">
-                    <el-input
-                      v-model="queryParams.ColContent2"
-                      placeholder="璇疯緭鍏�"
-                      clearable
-                      @keyup.enter.native="handleQuery"
-                      class="ForFilteringSchemes"
-                    />
-                  </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
-                  <el-col :span="7">
-                    <el-select
-                      v-model="queryParams.ColName"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
-                      <el-option
-                        v-for="(item, index) in btList"
-                        :key="index"
-                        :label="item.field"
-                        :value="item.field"
-                      ></el-option>
-                    </el-select>
-                  </el-col>
-                  <el-col :span="6" style="padding: 0 10px">
-                    <el-select
-                      v-model="queryParams.Comparator"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
-                      <el-option
-                        v-for="(item, index) in comparatorList"
-                        :key="index"
-                        :label="item.label"
-                        :value="item.value"
-                      ></el-option>
-                    </el-select>
-                  </el-col>
-                  <el-col :span="11">
-                    <el-input
-                      v-model="queryParams.ColContent"
-                      placeholder="璇疯緭鍏�"
-                      clearable
-                      @keyup.enter.native="handleQuery"
-                      class="ForFilteringSchemes"
-                    />
-                  </el-col>
-                </el-row>
-              </el-form-item>
-            </div>
-          </el-card>
-          <el-form-item label-width="78px" style="margin-top: 50px">
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">
-              鎼� 绱�</el-button
-            >
-            <el-button icon="el-icon-circle-close" @click="searchOpen = false"
-              >鍙� 娑�</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-drawer>
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleImport"
-          >瀵煎叆</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAddEdit((OperationType = 1))"
-          id="btn-Add"
-          >鏂板</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleEdit((row = rowForm), (OperationType = 3))"
-          >缂栬緫</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleEdit((row = rowForm), (OperationType = 2))"
-          >澶嶅埗</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="single"
-          @click="handleDelete"
-          >鍒犻櫎
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="set_CheckBill(0, (form = rowForm))"
-          >瀹℃牳</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="set_CheckBill(1, (form = rowForm))"
-          >杩斿鏍�</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="set_De_Stop(0, (form = rowForm))"
-          >绂佺敤</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="set_De_Stop(1, (form = rowForm))"
-          >鍙嶇鐢�</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          >瀵煎嚭</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleRowHide"
-          >闅愯棌鍒楄缃�</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
-          >鎼� 绱�</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >閲� 缃�</el-button
-        >
-      </el-col>
-      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
-    </el-row>
-    <div class="tableBox" v-loading="loading">
-      <el-table
-        :data="tableData"
-        ref="tableData"
-        max-height="750"
-        :summary-method="getSummaries"
-        @selection-change="handleSelectionChange"
-        show-summary
-        border
-        @row-click="handleRowClick"
-        :row-style="rowStyle"
-        @cell-dblclick="handleDblclick"
-        v-if="tableShow"
-      >
-        <template v-for="(item, index) in btList">
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center"
-            :fixed="item.fixed"
-            v-if="item.type == 'checkbox'"
-            :key="index"
-          />
-          <el-table-column
-            :align="item.align"
-            :prop="item.field"
-            :label="item.title"
-            :width="item.width"
-            :key="item.sorderid"
-            v-else-if="!item.hide && item.type != 'checkbox'"
-            :sortable="item.sort"
-            show-overflow-tooltip
-            :fixed="item.fixed"
-          >
-            <template slot-scope="{ row, column }">
-              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
-              <div :style="item.style">
-                <span v-if="column.property.includes('鏃ユ湡')">{{
-                  parseTime(row[column.property], "{y}-{m}-{d}")
-                }}</span>
-                <el-button
-                  type="text"
-                  @click="handleEdit(row, (OperationType = 3))"
-                  v-else-if="column.property == '鍗曟嵁鍙�'"
-                  >{{ row.鍗曟嵁鍙� }}</el-button
-                >
-                <span v-else>{{ row[column.label] }}</span>
-              </div>
-            </template>
-          </el-table-column>
-        </template>
-      </el-table>
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="page"
-        :limit.sync="pageSize"
-        :pageSizes="pageSizes"
-        @pagination="getList"
-      />
-      <el-dialog
-        title="闅愯棌鍒楄缃�"
-        :visible.sync="openRowHide"
-        width="816px"
-        append-to-body
-      >
-        <RowSettings
-          :colName="btResList"
-          :HModName="HModName"
-          @rowEditClose="rowSetClose"
-          v-if="rowHideShow"
-        />
-      </el-dialog>
-      <!-- 缂栬緫 -->
-      <el-dialog
-        title="缂栬緫浠撳簱"
-        :visible.sync="openEdit"
-        width="1480px"
-        append-to-body
-        class="xsckdBox"
-        :before-close="close"
-      >
-        <edit
-          :OperationType="OperationType"
-          :linterid="this.rowForm.HItemID"
-          :HSouceBillType="this.rowForm.HSourceBillType"
-          :copyType="copyType"
-          @editCloseGy="editGyClose"
-          v-if="editShow"
-        />
-      </el-dialog>
-      <el-dialog
-        :title="upload.title"
-        :visible.sync="upload.open"
-        width="1500px"
-        append-to-body
-      >
-        <div style="margin-top: -20px">
-          <el-button type="primary" @click="set_AddNew">瀵煎叆鏁版嵁</el-button>
-          <el-button type="primary" @click="upload.open = false">閫� 鍑�</el-button>
-          <el-upload
-            ref="upload"
-            :limit="1"
-            accept=".xlsx, .xls"
-            style="display: inline-block; margin-left: 10px"
-            :action="upload.url + '?updateSupport=' + upload.updateSupport"
-            :disabled="upload.isUploading"
-            :on-progress="handleFileUploadProgress"
-            :on-success="handleFileSuccess"
-          >
-            <el-button type="primary">鏂囦欢涓婁紶</el-button>
-          </el-upload>
-        </div>
-        <el-table
-          :data="uploadData"
-          v-loading="uploadTableLoading"
-          :row-class-name="uploadDataIndex"
-          border
-          height="550"
-        >
-          <el-table-column type="index" label="搴忓彿" width="55" align="center" />
-          <el-table-column label="浠撳簱浠g爜" prop="浠撳簱浠g爜" align="center" width="120" />
-          <el-table-column label="浠撳簱鍚嶇О" prop="浠撳簱鍚嶇О" align="center" width="120" />
-          <el-table-column label="鑱旂郴鐢佃瘽" prop="鑱旂郴鐢佃瘽" align="center" width="120" />
-          <el-table-column label="鑱屽憳浠g爜" prop="鑱屽憳浠g爜" align="center" width="120" />
-          <el-table-column label="鑱屽憳鍚嶇О" prop="鑱屽憳鍚嶇О" align="center" width="120" />
-          <el-table-column label="澶囨敞" prop="澶囨敞" align="center" width="120" />
-          <el-table-column label="鎿嶄綔" align="center">
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="uploadDataDelete(scope.row)"
-                >鍒犻櫎</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <pagination
-          v-show="uploadTotal > 0"
-          :total="uploadTotal"
-          :page.sync="uploadPage"
-          :limit.sync="uploadPageSize"
-          :pageSizes="uploadPageSizes"
-          @pagination="currentPage"
-        />
-      </el-dialog>
-    </div>
-  </div>
-</template>
-
-<script>
-import axios from "axios";
-import RowSettings from "@/views/component/rowSettings";
-import Edit from "@/views/gyWarehouse/edit";
-import gyWarehouse from "@/views/gyWarehouse";
-
-export default {
-  name: "GyWarehouse",
-  components: { RowSettings, Edit, gyWarehouse },
-  props: {
-    openPage: { type: String },
-  },
-  data() {
-    return {
-      HModName: "Gy_Warehouse",
-      editShow: false,
-      openEdit: false,
-      totalNameList: [],
-      tableShow: true,
-      openPrintList: false,
-      printListShow: false,
-      HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
-      HBillType: "Gy_Warehouse",
-      openBtnHide: false,
-      btnHideShow: false,
-      rowHideShow: false,
-      openRowHide: false,
-      copyType: 0,
-      comparatorList: [
-        { label: "=", value: "=" },
-        { label: ">=", value: ">=" },
-        { label: ">", value: ">" },
-        { label: "<=", value: "<=" },
-        { label: "<", value: "<" },
-        { label: "<>", value: "<>" },
-        { label: "鍖呭惈", value: "7" },
-        { label: "宸﹀寘鍚�", value: "8" },
-        { label: "鍙冲寘鍚�", value: "9" },
-        { label: "涓嶅寘鍚�", value: "10" },
-      ],
-      sWhere: "",
-      sTime: "",
-      eTime: "",
-      rqsgList: [
-        { label: "浠婂ぉ", value: 0 },
-        { label: "杩戜袱澶�", value: 1 },
-        { label: "杩戜笁澶�", value: 2 },
-        { label: "杩戝洓澶�", value: 3 },
-        { label: "杩戜簲澶�", value: 4 },
-        { label: "杩戝叚澶�", value: 5 },
-        { label: "杩戜竷澶�", value: 6 },
-        { label: "杩�30澶�", value: 29 },
-        { label: "杩戝崐骞�", value: 180 },
-        { label: "杩戜竴骞�", value: 365 },
-      ],
-      hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
-      addBtnShow: false,
-      zbIndex: null,
-      zbSelForm: {}, //瀛愯〃閫変腑鏁版嵁
-      dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
-      deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢
-      warehouseShow: false, //浠撳簱鏁版嵁缁勪欢
-      materialShow: false, //鐗╂枡鏁版嵁缁勪欢
-      deptform: {}, //寮圭獥閫変腑鏁版嵁
-      openData: false, //鏁版嵁寮圭獥
-      dialogTitle: "",
-      zuzhiId: "",
-      organizationList: [], //缁勭粐鍒楄〃
-      subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
-      OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
-      HInterID: null,
-      baseURL: "http://localhost:81/API/",
-      user: "admin",
-      currentRow: [],
-      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
-      lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
-      selectedRow: null, // 褰撳墠閫変腑鐨勮
-      rowForm: {},
-      checkedSysZb: [],
-      editData: [], //鐢熶骇璧勬枡瀛愯〃
-      editBtData: [], //瀛愯〃琛ㄥご
-      activeName: "first",
-      searchOpen: false,
-      // 寮瑰嚭灞傛爣棰�
-      title: "",
-      // 鏄惁鏄剧ず寮瑰嚭灞�
-      open: false,
-      // 鏃ユ湡鑼冨洿
-      dateRange: [],
-      // 鏌ヨ鍙傛暟
-      queryParams: {
-        HOrgID: null,
-        HName: null,
-        HNumber: null,
-        Comparator1: "",
-        Comparator2: "",
-        Comparator: "",
-        ColContent1: "",
-        ColContent2: "",
-        ColContent: "",
-      },
-      // 鏄剧ず鎼滅储鏉′欢
-      showSearch: true,
-      // 閫変腑鏁扮粍
-      ids: [],
-      // 闈炲崟涓鐢�
-      single: true,
-      // 闈炲涓鐢�
-      multiple: true,
-      // 閬僵灞�
-      loading: true,
-      tyResList: [], //閿�鍞嚭搴撳垪琛紙鎺ュ彛鏁版嵁锛�
-      btList: [], //閿�鍞嚭搴撹〃澶村垪琛ㄦ樉绀�
-      btResList: [],
-      tableData: [], //閿�鍞嚭搴撳垪琛�(鍒嗛〉鏄剧ず)
-      dataList: [],
-      titleData: ["HItemID", "HParentID"], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-      pageSizes: [50, 100, 500, 5000, 50000],
-      page: 1,
-      pageSize: 50,
-      total: 0,
-      scollHeight: document.body.clientHeight * (38.056 / 100),
-      // 琛ㄥ崟鍙傛暟
-      form: {},
-      // 琛ㄥ崟鏍¢獙
-      rules: {
-        HSupName: [{ required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }],
-        HDate: [{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }],
-        HExRate: [{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }],
-      },
-      upload: {
-        // 鏄惁鏄剧ず寮瑰嚭灞�
-        open: false,
-        // 寮瑰嚭灞傛爣棰�
-        title: "",
-        // 鏄惁绂佺敤涓婁紶
-        isUploading: false,
-        // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
-        updateSupport: 0,
-        // 璁剧疆涓婁紶鐨勮姹傚ご閮�
-        // headers: { Authorization: "Bearer " + getToken() },
-        // 涓婁紶鐨勫湴鍧�
-        url: "http://47.96.97.237/API/Gy_Source/Gy_Source_Excel",
-      },
-      uploadData: [],
-      alluploadList: [],
-      uploadTableLoading: false,
-      uploadPageSizes: [50, 100, 500, 5000, 50000],
-      uploadPage: 1,
-      uploadPageSize: 50,
-      uploadTotal: 0,
-    };
-  },
-  created() {
-    this.fetchData();
-    this.riqiChange();
-  },
-  methods: {
-    // 浠撳簱鍚屾
-    async handleSync() {
-      try {
-        let res = await axios.get(this.baseURL + "/Gy_Warehouse/Gy_WarehouseViewApi", {
-          params: {
-            Number: this.queryParams.HSyncNumber,
-            Type: "CK",
-            HUseOrgID: this.queryParams.HOrgID,
-          },
-        });
-        console.log(res.data);
-        let { count, Message } = res.data;
-
-        if (count == 1) {
-          this.$modal.msgSuccess(Message);
-        } else {
-          this.$modal.msgError(`鎺ュ彛璇锋眰澶辫触: ${Message}`);
-        }
-      } catch (err) {
-        this.$modal.msgError(`鎺ュ彛璇锋眰澶辫触: ${err}`);
-      }
-    },
-    getSummaries(param) {
-      const { columns, data } = param;
-      const sums = [];
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = "鍚堣";
-          return;
-        }
-        const values = data.map((item) => Number(item[column.property]));
-        if (this.totalNameList[index].totalRow) {
-          if (!values.every((value) => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0);
-          } else {
-            sums[index] = "";
-          }
-        }
-      }, 1000);
-      return sums;
-    },
-
-    //#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
-    defaintOperationByCompanyName() {
-      var result = false;
-      axios
-        .get(this.baseURL + "/Xt_getInfo/getCompanyName")
-        .then((response) => {
-          var data1 = response.data;
-          if (data1.count == 1) {
-            if (data1.data == "姘村姟") {
-              result = true;
-            }
-          }
-        })
-        .catch((error) => {
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-        });
-      return result;
-    },
-    handleBtnHide() {
-      this.btnHideShow = true;
-      this.openBtnHide = true;
-    },
-    handleRowHide() {
-      this.rowHideShow = true;
-      this.openRowHide = true;
-    },
-    rowSetClose(val) {
-      this.rowHideShow = false;
-      this.tableShow = true;
-      this.openRowHide = val;
-      this.getList();
-    },
-    riqiChange() {
-      const end = new Date();
-      const start = new Date();
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
-      const yyyyS = start.getFullYear();
-      const mmS = String(start.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
-      const ddS = String(start.getDate()).padStart(2, "0");
-      const yyyyE = end.getFullYear();
-      const mmE = String(end.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
-      const ddE = String(end.getDate()).padStart(2, "0");
-      this.sTime = yyyyS + "-" + mmS + "-" + ddS;
-      this.eTime = yyyyE + "-" + mmE + "-" + ddE;
-      this.dateRange = [this.sTime, this.eTime];
-    },
-    organizationChange(val) {
-      // let options=undefined
-      //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
-    },
-    //閮ㄩ棬寮圭獥璧嬪��
-    dbEmitData(deptRow, num) {
-      // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
-      if (num == 1) {
-        this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О;
-        this.form.HDeptID = deptRow.HItemID;
-        this.form.HEmpID = deptRow.HEmpID;
-        this.form.HManagerName = deptRow.璐熻矗浜�;
-        this.openData = false;
-      } else if (num == 2) {
-        this.editData[this.zbIndex].HWHID = deptRow.HItemID;
-        this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
-        this.openData = false;
-      } else if (num == 3) {
-        this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
-        this.editData[this.zbIndex].鐗╂枡浠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;
-      }
-    },
-    emitData(deptRow, num) {
-      this.dialogTypeNum = num;
-      this.deptform = deptRow;
-    },
-    deptClickSub() {
-      this.dbEmitData(this.deptform, this.dialogTypeNum);
-      this.deptform = {};
-    },
-    fetchData() {
-      //鐧诲綍鐢ㄦ埛淇℃伅
-      axios
-        .get(
-          "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
-        )
-        .then((response) => {
-          let data = response.data.data[0];
-          this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
-          this.queryParams.HOrgID = data.HUSEORGID;
-          this.user = data.Czymc;
-          axios
-            .get(this.baseURL + "/Web/GetOrganizations", {})
-            .then((response) => {
-              if (response.data.count == 1) {
-                this.organizationList = response.data.data; //缁勭粐鍒楄〃
-              }
-              this.getList();
-            })
-            .catch((error) => {
-              this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-            });
-        })
-        .catch((error) => {
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-        });
-    },
-    getList() {
-      this.tableShow = false;
-      this.loading = true;
-      if (this.pageSize == 0) {
-        this.pageSize = 50;
-      }
-      // this.queryParams.HOrgID = 100038
-      this.sWhere += "";
-      //鐢熶骇璧勬枡鍒楄〃
-      axios
-        .get(this.baseURL + "/Gy_WareHouse/listpage", {
-          params: {
-            sWhere: `${this.sWhere}`,
-            user: this.user,
-            Organization: "娴欐睙鏅轰簯杩堟��",
-            page: this.page,
-            size: this.pageSize,
-          },
-        })
-        .then((response) => {
-          this.tyResList = response.data.data; //鎬绘暟鎹�
-          let data1 = response.data;
-          let option = [];
-          if (data1.code == 1) {
-            this.btResList = data1.list; //鐢熶骇璧勬枡鎺ュ彛琛ㄥご鏁版嵁
-            this.total = data1.count;
-            var data = []; //鍒楀瓧娈垫暟鎹�
-            var col = [];
-            var totalArray = ["浠舵暟"];
-            //缁欑┖鐨勬暟缁勮祴鍊�
-            for (var key in data1.list) {
-              //寰簭閬嶅巻鏁扮粍
-              data.push({
-                id: data1.list[key].ColmCols,
-                name: data1.list[key].ColmCols,
-                Type: data1.list[key].ColmType,
-              }); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
-            }
-            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-            col.push({ type: "checkbox", fixed: "left", totalRowText: "鍚堣" });
-            for (var i = 0; i < data.length; i++) {
-              //閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
-              if (this.titleData.indexOf(data[i].name) > -1) {
-                //妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁$畻鍒�
-                col.push({
-                  field: data[i].id,
-                  title: data[i].name,
-                  align: "center",
-                  hide: true,
-                }); //闅愯棌id鍒�
-              } else if (
-                totalArray.indexOf(data[i].name) > -1 ||
-                data[i].Type == "Decimal" ||
-                data[i].Type == "Int32"
-              ) {
-                //璁$畻鍒�
-                col.push({
-                  field: data[i].id,
-                  title: data[i].name,
-                  align: "center",
-                  sort: true,
-                  totalRow: true,
-                  width: 120,
-                });
-              } else {
-                col.push({
-                  field: data[i].id,
-                  title: data[i].name,
-                  align: "center",
-                  sort: true,
-                  width: 200,
-                });
-              }
-            }
-            option.cols = [col];
-            this.dataList = option;
-            option.data = data1.data;
-            var result = data1.data;
-            var temp = "";
-            for (var i = 0; i < result.length; i++) {
-              if (temp != result[i]["HItemID"]) {
-                temp = result[i]["HItemID"];
-              } else {
-                result[i].鏃ユ湡 = null;
-                result[i].鍗曟嵁鍙� = "";
-                /*result[i].鐘舵�� = "";*/
-                result[i].绾㈣摑鍗曟爣璁� = "";
-                result[i].hsupid = "";
-                result[i].瀹㈡埛 = "";
-                result[i].HEmpID = "";
-                result[i].涓氬姟鍛� = "";
-                result[i].hmanagerid = "";
-                result[i].涓荤 = "";
-                result[i].hsecmanagerid = "";
-                result[i].鍙戣揣浜� = "";
-                result[i].hkeeperid = "";
-                result[i].淇濈鍛� = "";
-                result[i].HDeptID = "";
-                result[i].閮ㄩ棬 = "";
-                result[i].閿�鍞柟寮� = "";
-              }
-            }
-            option.data = result;
-            this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
-          }
-        })
-        .catch((error) => {
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-        });
-    },
-    DisPlay_HideColumn(HModName, user, option, dataOption) {
-      this.totalNameList = [];
-      axios
-        .get(this.baseURL + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
-          params: {
-            HModName: HModName,
-            user: user,
-          },
-        })
-        .then((res) => {
-          let data1 = res.data;
-          if (data1.data.length != 0) {
-            var dataCol = []; //鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-            var newCols = [[]]; //瀵瑰簲鏁版嵁搴撳垪椤哄簭col
-            newCols[0].push(option.cols[0][0]); //鏀惧叆绗竴涓猚heckbox
-            dataCol = data1.data[0].HGridString.split(",");
-            //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
-            if (dataCol.length == option.cols[0].length - 1) {
-              //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
-              for (var j = 0; j < option.cols[0].length - 1; j++) {
-                for (var i = 0; i < option.cols[0].length - 1; i++) {
-                  var dataCols = dataCol[j].split("|");
-                  //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
-                  if (option.cols[0][i + 1]["field"] == dataCols[5]) {
-                    //闅愯棌鍒�
-                    if (dataCols[1] == 1) {
-                      option.cols[0][i + 1]["hide"] = true;
-                    }
-                    //璁剧疆鍒楀
-                    if (dataCols[3] > 0) {
-                      option.cols[0][i + 1]["width"] = dataCols[3];
-                    }
-                    //璁剧疆鍐呭瀛椾綋澶у皬
-                    if (data1.data[0].HFontSize != 0) {
-                      option.cols[0][i + 1]["style"] =
-                        "font-size:" + data1.data[0].HFontSize + "px;";
-                    } else {
-                      option.cols[0][i + 1]["style"] = "font-size:100%";
-                    }
-                    //鏄剧ず鍒�
-                    if (
-                      dataCols[1] == 0 &&
-                      this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1
-                    ) {
-                      option.cols[0][i + 1]["hide"] = false;
-                    }
-                    //缁熻鍒�
-                    if (dataCols[6] == 1) {
-                      option.cols[0][i + 1]["totalRow"] = true;
-                    } else {
-                      option.cols[0][i + 1]["totalRow"] = false;
-                    }
-                    //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
-                    switch (dataCols[2]) {
-                      case "L":
-                        option.cols[0][i + 1]["align"] = "left";
-                        break;
-                      case "M":
-                        option.cols[0][i + 1]["align"] = "center";
-                        break;
-                      case "R":
-                        option.cols[0][i + 1]["align"] = "right";
-                        break;
-                    }
-                    //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
-                    if (dataCols[4] != null && dataCols[4] != "") {
-                      option.cols[0][i + 1]["title"] = dataCols[4];
-                    }
-                    newCols[0].push(option.cols[0][i + 1]);
-                    break;
-                  }
-                }
-              }
-              //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
-              if (dataCol.length == newCols[0].length - 1) {
-                option.cols = newCols;
-                //鍙栨秷鍐荤粨鍒�
-                for (var i = 1; i < option.cols[0].length - 1; i++) {
-                  if (option.cols[0][i + 1]["fixed"] != null) {
-                    option.cols[0][i + 1]["fixed"] = null;
-                  } else {
-                    break;
-                  }
-                }
-                //鍐荤粨鍒�
-                if (data1.data[0].HFixCols != 0) {
-                  for (var i = 0; i < data1.data[0].HFixCols; i++) {
-                    if (
-                      dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1
-                    ) {
-                      data1.data[0].HFixCols += 1;
-                    }
-
-                    option.cols[0][i + 1]["fixed"] = "left";
-                  }
-                }
-                //璁剧疆鍒楁帓搴�
-                for (var i = 1; i < option.cols[0].length; i++) {
-                  if (data1.data[0].HSortFlag == "鏄�") {
-                    option.cols[0][i]["sort"] = true;
-                  } else {
-                    option.cols[0][i]["sort"] = false;
-                  }
-                }
-              }
-            }
-            this.btList = option.cols[0];
-            this.btList.map((item) => {
-              if (!item.hide) {
-                this.totalNameList.push(item);
-              }
-            });
-            if (data1.data[0].HPageSize == 0) {
-              this.pageSize = 50;
-            } else {
-              this.pageSize = data1.data[0].HPageSize;
-            }
-            this.tableData = option.data;
-            this.tableShow = true;
-            this.loading = false;
-          } else {
-            this.btList = dataOption.cols[0];
-            this.btList.map((item) => {
-              if (!item.hide) {
-                this.totalNameList.push(item);
-              }
-            });
-            this.tableData = dataOption.data;
-            this.tableShow = true;
-            this.loading = false;
-          }
-        })
-        .catch((error) => {
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-        });
-    },
-    renderHeader(h, { column, $index }) {
-      // 鏂板缓涓�涓� span
-      let span = document.createElement(span); // 璁剧疆琛ㄥご鍚嶇О
-      span.innerText = column.label;
-      //涓存椂鎻掑叆 document
-      document.body.appendChild(span); // 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
-      document.body.removeChild(span);
-      return h(span, column.label);
-    },
-    //鐐瑰嚮琛�
-    handleRowClick(row, column, event) {
-      this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆¢�変腑鐨勮
-      this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
-      this.lastSelectedRowIndex = this.tableData.indexOf(row);
-      this.$refs.tableData.toggleRowSelection(row);
-    },
-    //閫変腑琛岄珮浜牱寮�
-    rowStyle({ row, rowIndex }) {
-      if (this.ids.includes(row.HItemID)) {
-        return { background: "#ecf5ff" };
-      }
-    },
-    //鍙屽嚮琛�
-    handleDblclick(row, column, cell, event) {
-      this.OperationType = 3;
-      this.handleEdit();
-    },
-    // 澶氶�夋閫変腑鏁版嵁
-    handleSelectionChange(selection) {
-      // this.rowForm = {}
-      this.ids = selection.map((item) => item.HItemID);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
-      if (!this.single) {
-        this.rowForm = selection[0];
-      }
-    },
-    //鎵撳紑渚ц竟鎼滅储寮圭獥
-    handleSearch() {
-      this.searchOpen = true;
-    },
-    /** 鎼滅储鎸夐挳鎿嶄綔 */
-    handleQuery() {
-      this.sWhere = "";
-      if (this.queryParams.ColName && this.queryParams.Comparator) {
-        var com = "";
-        switch (this.queryParams.Comparator) {
-          case "7":
-            com = "like'%" + this.queryParams.ColContent + "%'";
-            break;
-          case "8":
-            com = "like'%" + this.queryParams.ColContent + "'";
-            break;
-          case "9":
-            com = "like'" + this.queryParams.ColContent + "%'";
-            break;
-          case "10":
-            com = "not like'%" + this.queryParams.ColContent + "%'";
-            break;
-          default:
-            com =
-              "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
-            break;
-        }
-        this.sWhere += " and " + this.queryParams.ColName + " " + com;
-      }
-      if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
-        var com1 = "";
-        switch (this.queryParams.Comparator1) {
-          case "7":
-            com1 = "like'%" + this.queryParams.ColContent1 + "%'";
-            break;
-          case "8":
-            com1 = "like'%" + this.queryParams.ColContent1 + "'";
-            break;
-          case "9":
-            com1 = "like'" + this.queryParams.ColContent1 + "%'";
-            break;
-          case "10":
-            com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
-            break;
-          default:
-            com1 =
-              "" +
-              this.queryParams.Comparator1 +
-              "'" +
-              this.queryParams.ColContent1 +
-              "'";
-            break;
-        }
-        this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
-      }
-      if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
-        var com2 = "";
-        switch (this.queryParams.Comparator2) {
-          case "7":
-            com2 = "like'%" + this.queryParams.ColContent2 + "%'";
-            break;
-          case "8":
-            com2 = "like'%" + this.queryParams.ColContent2 + "'";
-            break;
-          case "9":
-            com2 = "like'" + this.queryParams.ColContent2 + "%'";
-            break;
-          case "10":
-            com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
-            break;
-          default:
-            com2 =
-              "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
-            break;
-        }
-        this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
-      }
-      if (this.queryParams.HNumber) {
-        this.sWhere += " and 浠撳簱浠g爜 like '%" + this.queryParams.HNumber + "%'";
-      }
-      if (this.queryParams.HName) {
-        this.sWhere += " and 浠撳簱鍚嶇О like '%" + this.queryParams.HName + "%'";
-      }
-      if (this.queryParams.HOrgName) {
-        this.sWhere += " and 缁勭粐鍚嶇О = '" + this.queryParams.HOrgName + "'";
-      }
-      // this.sWhere += this.addSWhereByOpenType()
-      // this.sWhere += this.getOrgIDByUser()
-      this.searchOpen = false;
-      this.getList();
-    },
-    // 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
-    addSWhereByOpenType() {
-      //鑾峰彇鍙傛暟
-      var sWhere = "";
-      //this.openPage鍒ゆ柇鏄惁鏈夊�硷紝鏈変唬琛ㄥ叾瀹冮〉闈㈤�氳繃閫夋嫨鎸夐挳鎵撳紑
-      if (this.openPage) {
-        sWhere += " and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'')  != ''";
-        return sWhere;
-      }
-      return sWhere;
-    },
-    //鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
-    getOrgIDByUser() {
-      var res = "";
-      axios
-        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
-          params: {
-            HModName: this.HModName,
-            user: this.user,
-            HOrgID: this.zuzhiId,
-          },
-        })
-        .then((response) => {
-          let result = response.data;
-          if (result.count == 1) {
-            if (result.data[0].sWhere == "1") {
-              res = " and HUSEORGID = '" + this.zuzhiId + "'";
-            } else {
-              res = result.data[0].sWhere;
-            }
-          }
-        })
-        .catch((error) => {
-          res = " and 1 = 0";
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-        });
-      return res;
-    },
-    /** 閲嶇疆鎸夐挳鎿嶄綔 */
-    resetQuery() {
-      this.dateRange = [];
-      this.sWhere = "";
-      this.queryParams = {
-        HBillNo: "",
-        HInitTimeCycle: 29,
-        HProjectNumber: "",
-        HCusID: null,
-        HMaterNumber: "",
-        HMaterName: "",
-        ColName1: "",
-        ColName2: "",
-        ColName: "",
-        Comparator1: "",
-        Comparator2: "",
-        Comparator: "",
-        ColContent1: "",
-        ColContent2: "",
-        ColContent: "",
-        HSyncNumber,
-      };
-      this.riqiChange();
-      this.resetForm("queryForm");
-      this.getList();
-    },
-
-    //閫�鍑�
-    close() {
-      this.tableShow = true;
-      this.openEdit = false;
-      this.getList();
-    },
-    //鎵撳紑鏂板缁勪欢寮圭獥
-    handleAddEdit() {
-      this.rowForm.HItemID = 0;
-      this.$nextTick(() => {
-        this.openEdit = true;
-        this.editShow = true;
-      });
-    },
-    //鎵撳紑淇敼缁勪欢寮圭獥
-    handleEdit() {
-      this.$nextTick(() => {
-        this.openEdit = true;
-        this.editShow = true;
-      });
-    },
-    //鍏抽棴缂栬緫椤甸潰
-    editGyClose(val) {
-      this.editShow = false;
-      this.openEdit = false;
-      (this.multiple = true), this.getList();
-    },
-    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-    handleDelete() {
-      this.$modal
-        .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
-        .then(() => {
-          if (!this.rowForm.瀹℃牳浜�) {
-            axios
-              .get(this.baseURL + "/DeltetGy_Warehouse", {
-                params: { HItemID: this.rowForm.HItemID.toString(), user: this.user },
-              })
-              .then((response) => {
-                if (response.data.count == 1) {
-                  this.getList();
-                  this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-                } else {
-                  this.$modal.msgError("閿欒:" + result.code + result.Message);
-                }
-              })
-              .catch((error) => {
-                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-              });
-          } else {
-            this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
-          }
-        })
-        .catch(() => {});
-    },
-    // 鍙嶅鏍�/瀹℃牳鏁版嵁
-    set_CheckBill(num, form) {
-      var InterID = form.HItemID || form.HInterID;
-      //閫昏緫瀹℃牳鏂规硶
-      axios
-        .get(this.baseURL + "/Gy_Warehouse/AuditGy_Warehouse", {
-          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
-        })
-        .then((response) => {
-          let result = response.data;
-          if (result.code == 1) {
-            this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
-            this.getList();
-          } else {
-            this.$modal.msgError("閿欒:" + result.code + result.Message);
-          }
-        })
-        .catch((error) => {
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-        });
-    },
-    // 鍙嶇鐢�/绂佺敤鏁版嵁
-    set_De_Stop(num, form) {
-      var InterID = form.HItemID || form.HInterID;
-      //閫昏緫瀹℃牳鏂规硶
-      axios
-        .get(this.baseURL + "/Gy_Warehouse/StopGy_Warehouse", {
-          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
-        })
-        .then((response) => {
-          let result = response.data;
-          if (result.code == 1) {
-            this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
-            this.getList();
-          } else {
-            this.$modal.msgError("閿欒:" + result.code + result.Message);
-          }
-        })
-        .catch((error) => {
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-        });
-    },
-    //瀵煎嚭
-    handleExport() {
-      const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
-      const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
-      this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
-      this.$XLSX.writeFile(wb, `gyWarehouse_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
-    },
-    handleImport() {
-      this.uploadData = [];
-      this.upload.isUploading = false;
-      this.upload.title = "瀵煎叆";
-      this.upload.open = true;
-    },
-    // 鏂囦欢涓婁紶涓鐞�
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
-      this.uploadTableLoading = true;
-    },
-    // 鏂囦欢涓婁紶鎴愬姛澶勭悊
-    handleFileSuccess(response, file, fileList) {
-      // this.upload.open = false;
-      this.upload.isUploading = true;
-      this.$refs.upload.clearFiles();
-      if (response.code == 1) {
-        this.alluploadList = response.data;
-        this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
-        this.uploadTotal = this.alluploadList.length;
-        this.uploadTableLoading = false;
-        // this.set_AddNew(response.data)
-      } else {
-        this.$alert(
-          "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-            response.Message +
-            "</div>",
-          "瀵煎叆缁撴灉",
-          { dangerouslyUseHTMLString: true }
-        );
-      }
-    },
-    // 鎻愪氦涓婁紶鏂囦欢
-    submitFileForm() {
-      this.$refs.upload.submit();
-    },
-    set_AddNew() {
-      var num = [];
-      for (var i = 0; i < this.uploadData.length; i++) {
-        if (this.uploadData[i] != "") {
-          num.push(this.uploadData[i]);
-        }
-      }
-      var sSubStr = JSON.stringify(num);
-      var sMainSub = sSubStr + "&鍜�" + this.user;
-      axios({
-        method: "post",
-        url: this.baseURL + "/Gy_Warehouse/Gy_Process_Excel",
-        data: {
-          sMainSub: sMainSub,
-        },
-      })
-        .then((res) => {
-          this.$alert(
-            "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-              res.data.Message +
-              "</div>",
-            "瀵煎叆缁撴灉",
-            { dangerouslyUseHTMLString: true }
-          );
-          this.upload.open = false;
-          this.getList();
-        })
-        .catch((error) => {
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-        });
-    },
-    uploadDataIndex({ row, rowIndex }) {
-      row.index = rowIndex + 1;
-    },
-    uploadDataDelete(row) {
-      this.$modal
-        .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
-        .then(() => {
-          const deleteList = [row.index];
-          const data = this.uploadData;
-          this.uploadData = data.filter((item) => {
-            return deleteList.indexOf(item.index) == -1;
-          });
-        })
-        .catch(() => {});
-    },
-    getPage(page, list) {
-      let sindex = (parseInt(page) - 1) * this.uploadPageSize;
-      let eindex = parseInt(page) * this.uploadPageSize;
-      let newList = list.slice(sindex, eindex);
-      console.log(newList);
-      return newList;
-    },
-    currentPage(val) {
-      this.uploadPage = val.page;
-      setTimeout(() => {
-        this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
-      }, 100);
-    },
-  },
-};
-</script>
-<style>
-.xsckdBox .el-date-editor.el-input {
-  width: 100%;
-}
-
-.wh-sync > .el-form-item__content {
-  display: flex;
-  flex-direction: row;
-  width: 60%;
-}
-</style>
diff --git a/src/views/cgPoInStockBill/index.vue b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
similarity index 88%
copy from src/views/cgPoInStockBill/index.vue
copy to src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
index e057ad3..e3d98b7 100644
--- a/src/views/cgPoInStockBill/index.vue
+++ b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
@@ -1,51 +1,94 @@
 <template>
   <div style="padding: 10px">
-    <el-drawer title="鏌ヨ" :visible.sync="searchOpen" :with-header="false" size="650px">
-      <div style="padding: 50px; width: 630px">
-        <div class="searchText">
-          <div style="font-size: 18px">QUICK SEARCH</div>
-          <div>蹇�熸悳绱�</div>
-          <div class="searchImg"></div>
-        </div>
-        <el-form :model="queryParams" ref="queryForm" label-width="98px">
-          <el-row>
-            <el-form-item label="鑱屽憳浠g爜" prop="HNumber">
-              <el-input
-                v-model="queryParams.HNumber"
-                placeholder="璇疯緭鍏ヨ亴鍛樹唬鐮�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="鑱屽憳鍚嶇О" prop="HName">
-              <el-input
-                v-model="queryParams.HName"
-                placeholder="璇疯緭鍏ヨ亴鍛樺悕绉�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="缁勭粐">
-              <el-select
-                v-model="queryParams.HOrgID"
-                placeholder="璇烽�夋嫨"
-                class="ForFilteringSchemes"
-              >
-                <el-option
-                  v-for="(item, index) in organizationList"
-                  :key="index"
-                  :label="item.Name"
-                  :value="item.ID"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-row>
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      label-width="78px"
+      class="searchBox"
+    >
+      <el-row>
+        <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+          <el-date-picker
+            v-model="dateRange"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="鏃ユ湡闂撮殧">
+          <el-select
+            v-model="queryParams.HInitTimeCycle"
+            placeholder="璇烽�夋嫨"
+            @change="riqiChange"
+          >
+            <el-option
+              v-for="(item, index) in rqsgList"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-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="缁勭粐">
+          <el-select
+            v-model="queryParams.HOrgID"
+            placeholder="璇烽�夋嫨"
+            class="ForFilteringSchemes"
+          >
+            <el-option
+              v-for="(item, index) in organizationList"
+              :key="index"
+              :label="item.Name"
+              :value="item.ID"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-row>
+      <el-form-item label-width="78px">
+        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">
+          鎼� 绱�</el-button
+        >
+        <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false"
+          >鍙� 娑�</el-button
+        >
+      </el-form-item>
+      <el-collapse v-model="activeSeach">
+        <el-collapse-item title="鏇村" name="1">
           <el-card class="box-card">
+            <el-form :inline="true">
+              <el-form-item label="涓氬姟鍛�">
+                <el-input></el-input>
+              </el-form-item>
+
+              <el-form-item label="鐗╂枡浠g爜">
+                <el-input></el-input>
+              </el-form-item>
+
+              <el-form-item label="鐗╂枡鍚嶇О">
+                <el-input></el-input>
+              </el-form-item>
+
+              <el-form-item label="渚涘簲鍟�">
+                <el-input></el-input>
+              </el-form-item>
+            </el-form>
             <div slot="header" class="clearfix"><span>杩囨护</span></div>
             <div>
-              <el-form-item label-width="0">
-                <el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName1"
@@ -86,10 +129,10 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName2"
@@ -131,10 +174,10 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName"
@@ -174,104 +217,12 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
-            </div>
-          </el-card>
-          <el-form-item label-width="78px" style="margin-top: 50px">
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">
-              鎼� 绱�</el-button
-            >
-            <el-button icon="el-icon-circle-close" @click="searchOpen = false"
-              >鍙� 娑�</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-drawer>
-    <el-row>
-      <el-form>
-        <el-col :span="4" class="inline">
-          <el-form-item label="鏃ユ湡闂撮殧" class="form-item-inline">
-            <el-select
-              v-model="queryParams.timeSpan"
-              placeholder="璇烽�夋嫨鏃ユ湡闂撮殧"
-              @change="onDateScanOptionChangerHandler"
-            >
-              <el-option
-                v-for="(item, index) in [
-                  {
-                    label: '浠绘剰闂撮殧',
-                    value: -1,
-                  },
-                  {
-                    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: 182,
-                  },
-                  {
-                    label: '杩戜竴骞�',
-                    value: 365,
-                  },
-                ]"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="寮�濮嬫棩鏈�" class="form-item-inline">
-            <el-date-picker
-              v-model="queryParams.HBeginDate"
-              :disabled="disableDataPicker"
-              value-format="yyyy-MM-DD"
-            ></el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="缁撴潫鏃ユ湡" class="form-item-inline">
-            <el-date-picker
-              v-model="queryParams.HEndDate"
-              :disabled="disableDataPicker"
-              value-format="yyyy-MM-DD"
-            ></el-date-picker>
-          </el-form-item>
-        </el-col>
-      </el-form>
-    </el-row>
+                </el-form-item>
+              </el-row>
+            </div> </el-card
+        ></el-collapse-item>
+      </el-collapse>
+    </el-form>
     <el-row :gutter="10" class="mb8">
       <!-- <el-col :span="1.5">
         <el-button
@@ -286,7 +237,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAddEdit((OperationType = 1))"
@@ -296,8 +246,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -307,8 +256,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -318,8 +266,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
+          type="primary"
           icon="el-icon-delete"
           size="mini"
           :disabled="single"
@@ -329,8 +276,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -340,8 +286,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -373,8 +318,7 @@
       </el-col> -->
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -384,8 +328,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -395,8 +338,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -406,8 +348,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -417,8 +358,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -428,8 +368,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -440,8 +379,7 @@
 
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
@@ -450,8 +388,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleRowHide"
@@ -464,7 +401,7 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button type="" icon="el-icon-refresh" size="mini" @click="resetQuery"
           >閲� 缃�</el-button
         >
       </el-col>
@@ -656,18 +593,19 @@
 <script>
 import axios from "axios";
 import RowSettings from "@/views/component/rowSettings";
-import Edit from "@/views/gyEmployee/edit";
-import gySource from "@/views/gySource";
+import gySource from "@/views/basic/gySource";
 import dayjs from "dayjs";
 
 export default {
   name: "GySource",
-  components: { RowSettings, Edit, gySource },
+  components: { RowSettings, gySource },
   props: {
     openPage: { type: String },
   },
   data() {
     return {
+      activeSeach: "",
+      dateRange: [],
       HModName: "Cg_POOrderBillList",
       editShow: false,
       openEdit: false,
@@ -812,15 +750,11 @@
       uploadTotal: 0,
     };
   },
-  mounted() {
-    this.queryParams.HBeginDate = dayjs(new Date())
-      .subtract(29, "d")
-      .format("YYYY-MM-DDTHH:mm:ss");
-    this.queryParams.HEndDate = dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss");
-    this.fetchData();
+  mounted() {},
+  created() {
     this.riqiChange();
+    this.getList();
   },
-  created() {},
   methods: {
     onDateScanOptionChangerHandler(e) {
       this.queryParams.timeSpan = e;
@@ -982,9 +916,13 @@
       if (this.pageSize == 0) {
         this.pageSize = 50;
       }
-      // this.queryParams.HOrgID = 100038
-      // this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
-      // 鏀舵枡閫氱煡鍗曞垪琛�
+
+      if (this.dateRange.length > 0) {
+        this.sWhere +=
+          " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
+        this.sWhere +=
+          " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+      }
       try {
         let res = await axios.get(this.baseURL + "Cg_POInStockBill/page", {
           params: {
diff --git a/src/views/cgPoOrderBill/index.vue b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
similarity index 93%
rename from src/views/cgPoOrderBill/index.vue
rename to src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
index b27aeb3..b7234d7 100644
--- a/src/views/cgPoOrderBill/index.vue
+++ b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
@@ -1,51 +1,78 @@
 <template>
   <div style="padding: 10px">
-    <el-drawer title="鏌ヨ" :visible.sync="searchOpen" :with-header="false" size="650px">
-      <div style="padding: 50px; width: 630px">
-        <div class="searchText">
-          <div style="font-size: 18px">QUICK SEARCH</div>
-          <div>蹇�熸悳绱�</div>
-          <div class="searchImg"></div>
-        </div>
-        <el-form :model="queryParams" ref="queryForm" label-width="98px">
-          <el-row>
-            <el-form-item label="鑱屽憳浠g爜" prop="HNumber">
-              <el-input
-                v-model="queryParams.HNumber"
-                placeholder="璇疯緭鍏ヨ亴鍛樹唬鐮�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="鑱屽憳鍚嶇О" prop="HName">
-              <el-input
-                v-model="queryParams.HName"
-                placeholder="璇疯緭鍏ヨ亴鍛樺悕绉�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="缁勭粐">
-              <el-select
-                v-model="queryParams.HOrgID"
-                placeholder="璇烽�夋嫨"
-                class="ForFilteringSchemes"
-              >
-                <el-option
-                  v-for="(item, index) in organizationList"
-                  :key="index"
-                  :label="item.Name"
-                  :value="item.ID"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-row>
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      label-width="78px"
+      class="searchBox"
+    >
+      <el-row>
+        <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+          <el-date-picker
+            v-model="dateRange"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="鏃ユ湡闂撮殧">
+          <el-select
+            v-model="queryParams.HInitTimeCycle"
+            placeholder="璇烽�夋嫨"
+            @change="riqiChange"
+          >
+            <el-option
+              v-for="(item, index) in rqsgList"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-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="缁勭粐">
+          <el-select
+            v-model="queryParams.HOrgID"
+            placeholder="璇烽�夋嫨"
+            class="ForFilteringSchemes"
+          >
+            <el-option
+              v-for="(item, index) in organizationList"
+              :key="index"
+              :label="item.Name"
+              :value="item.ID"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-row>
+      <el-form-item label-width="78px">
+        <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">
+          鎼� 绱�</el-button
+        >
+        <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false"
+          >鍙� 娑�</el-button
+        >
+      </el-form-item>
+
+      <el-collapse v-model="activeSeach">
+        <el-collapse-item title="鏇村" name="1">
           <el-card class="box-card">
             <div slot="header" class="clearfix"><span>杩囨护</span></div>
             <div>
-              <el-form-item label-width="0">
-                <el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName1"
@@ -86,10 +113,10 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName2"
@@ -131,10 +158,10 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName"
@@ -174,21 +201,14 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
+                </el-form-item>
+              </el-row>
             </div>
           </el-card>
-          <el-form-item label-width="78px" style="margin-top: 50px">
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">
-              鎼� 绱�</el-button
-            >
-            <el-button icon="el-icon-circle-close" @click="searchOpen = false"
-              >鍙� 娑�</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-drawer>
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
+
     <el-row>
       <el-form>
         <el-col :span="4" class="inline">
@@ -286,7 +306,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAddEdit((OperationType = 1))"
@@ -296,8 +315,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -307,8 +325,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -318,8 +335,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
+          type="primary"
           icon="el-icon-delete"
           size="mini"
           :disabled="single"
@@ -329,8 +345,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -340,8 +355,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -373,8 +387,7 @@
       </el-col> -->
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -384,8 +397,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -395,8 +407,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -406,8 +417,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -417,8 +427,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -428,8 +437,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -440,8 +448,7 @@
 
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
@@ -450,8 +457,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleRowHide"
@@ -464,7 +470,7 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
           >閲� 缃�</el-button
         >
       </el-col>
@@ -656,18 +662,18 @@
 <script>
 import axios from "axios";
 import RowSettings from "@/views/component/rowSettings";
-import Edit from "@/views/gyEmployee/edit";
-import gySource from "@/views/gySource";
+import gySource from "@/views/basic/gySource";
 import dayjs from "dayjs";
 
 export default {
   name: "GySource",
-  components: { RowSettings, Edit, gySource },
+  components: { RowSettings, gySource },
   props: {
     openPage: { type: String },
   },
   data() {
     return {
+      activeSeach: "",
       HModName: "Cg_POOrderBillList",
       editShow: false,
       openEdit: false,
@@ -812,15 +818,11 @@
       uploadTotal: 0,
     };
   },
-  mounted() {
-    this.queryParams.HBeginDate = dayjs(new Date())
-      .subtract(29, "d")
-      .format("YYYY-MM-DDTHH:mm:ss");
-    this.queryParams.HEndDate = dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss");
-    this.fetchData();
+  mounted() {},
+  created() {
     this.riqiChange();
+    this.getList();
   },
-  created() {},
   methods: {
     onDateScanOptionChangerHandler(e) {
       this.queryParams.timeSpan = e;
@@ -981,6 +983,12 @@
       if (this.pageSize == 0) {
         this.pageSize = 50;
       }
+      if (this.dateRange.length > 0) {
+        this.sWhere +=
+          " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
+        this.sWhere +=
+          " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+      }
       // this.queryParams.HOrgID = 100038
       // this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
       //鐢熶骇璧勬枡鍒楄〃
diff --git a/src/views/cgPoInStockBill/index.vue b/src/views/sell/XsSeOutStockBackBillList.vue
similarity index 86%
copy from src/views/cgPoInStockBill/index.vue
copy to src/views/sell/XsSeOutStockBackBillList.vue
index e057ad3..a291e9f 100644
--- a/src/views/cgPoInStockBill/index.vue
+++ b/src/views/sell/XsSeOutStockBackBillList.vue
@@ -1,51 +1,70 @@
 <template>
   <div style="padding: 10px">
-    <el-drawer title="鏌ヨ" :visible.sync="searchOpen" :with-header="false" size="650px">
-      <div style="padding: 50px; width: 630px">
-        <div class="searchText">
-          <div style="font-size: 18px">QUICK SEARCH</div>
-          <div>蹇�熸悳绱�</div>
-          <div class="searchImg"></div>
-        </div>
-        <el-form :model="queryParams" ref="queryForm" label-width="98px">
-          <el-row>
-            <el-form-item label="鑱屽憳浠g爜" prop="HNumber">
-              <el-input
-                v-model="queryParams.HNumber"
-                placeholder="璇疯緭鍏ヨ亴鍛樹唬鐮�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="鑱屽憳鍚嶇О" prop="HName">
-              <el-input
-                v-model="queryParams.HName"
-                placeholder="璇疯緭鍏ヨ亴鍛樺悕绉�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="缁勭粐">
-              <el-select
-                v-model="queryParams.HOrgID"
-                placeholder="璇烽�夋嫨"
-                class="ForFilteringSchemes"
-              >
-                <el-option
-                  v-for="(item, index) in organizationList"
-                  :key="index"
-                  :label="item.Name"
-                  :value="item.ID"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-row>
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      label-width="78px"
+      class="searchBox"
+    >
+      <el-row>
+        <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+          <el-date-picker
+            v-model="dateRange"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="鏃ユ湡闂撮殧">
+          <el-select
+            v-model="queryParams.HInitTimeCycle"
+            placeholder="璇烽�夋嫨"
+            @change="riqiChange"
+          >
+            <el-option
+              v-for="(item, index) in rqsgList"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-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="缁勭粐">
+          <el-select
+            v-model="queryParams.HOrgID"
+            placeholder="璇烽�夋嫨"
+            class="ForFilteringSchemes"
+          >
+            <el-option
+              v-for="(item, index) in organizationList"
+              :key="index"
+              :label="item.Name"
+              :value="item.ID"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-row>
+
+      <el-collapse v-model="activeSeach">
+        <el-collapse-item title="鏇村" name="1">
           <el-card class="box-card">
             <div slot="header" class="clearfix"><span>杩囨护</span></div>
             <div>
-              <el-form-item label-width="0">
-                <el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName1"
@@ -86,10 +105,10 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName2"
@@ -131,10 +150,10 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName"
@@ -174,104 +193,23 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
+                </el-form-item>
+              </el-row>
             </div>
           </el-card>
-          <el-form-item label-width="78px" style="margin-top: 50px">
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">
-              鎼� 绱�</el-button
-            >
-            <el-button icon="el-icon-circle-close" @click="searchOpen = false"
-              >鍙� 娑�</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-drawer>
-    <el-row>
-      <el-form>
-        <el-col :span="4" class="inline">
-          <el-form-item label="鏃ユ湡闂撮殧" class="form-item-inline">
-            <el-select
-              v-model="queryParams.timeSpan"
-              placeholder="璇烽�夋嫨鏃ユ湡闂撮殧"
-              @change="onDateScanOptionChangerHandler"
-            >
-              <el-option
-                v-for="(item, index) in [
-                  {
-                    label: '浠绘剰闂撮殧',
-                    value: -1,
-                  },
-                  {
-                    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: 182,
-                  },
-                  {
-                    label: '杩戜竴骞�',
-                    value: 365,
-                  },
-                ]"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="寮�濮嬫棩鏈�" class="form-item-inline">
-            <el-date-picker
-              v-model="queryParams.HBeginDate"
-              :disabled="disableDataPicker"
-              value-format="yyyy-MM-DD"
-            ></el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="缁撴潫鏃ユ湡" class="form-item-inline">
-            <el-date-picker
-              v-model="queryParams.HEndDate"
-              :disabled="disableDataPicker"
-              value-format="yyyy-MM-DD"
-            ></el-date-picker>
-          </el-form-item>
-        </el-col>
-      </el-form>
-    </el-row>
+        </el-collapse-item>
+      </el-collapse>
+
+      <el-form-item label-width="78px">
+        <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">
+          鎼� 绱�</el-button
+        >
+        <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false"
+          >鍙� 娑�</el-button
+        >
+      </el-form-item>
+    </el-form>
+
     <el-row :gutter="10" class="mb8">
       <!-- <el-col :span="1.5">
         <el-button
@@ -286,7 +224,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAddEdit((OperationType = 1))"
@@ -296,8 +233,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -307,8 +243,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -318,8 +253,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
+          type="primary"
           icon="el-icon-delete"
           size="mini"
           :disabled="single"
@@ -329,23 +263,21 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
-          @click="set_CheckBill(0, (form = rowForm))"
+          @click="set_CheckBill(1, (form = rowForm))"
           >瀹℃牳</el-button
         >
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
-          @click="set_CheckBill(1, (form = rowForm))"
+          @click="set_CheckBill(2, (form = rowForm))"
           >鍙嶅鏍�</el-button
         >
       </el-col>
@@ -373,8 +305,7 @@
       </el-col> -->
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -384,8 +315,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -395,8 +325,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -406,8 +335,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -417,8 +345,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -428,8 +355,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -440,8 +366,7 @@
 
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
@@ -450,8 +375,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleRowHide"
@@ -464,7 +388,7 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
           >閲� 缃�</el-button
         >
       </el-col>
@@ -656,22 +580,22 @@
 <script>
 import axios from "axios";
 import RowSettings from "@/views/component/rowSettings";
-import Edit from "@/views/gyEmployee/edit";
-import gySource from "@/views/gySource";
 import dayjs from "dayjs";
 
 export default {
   name: "GySource",
-  components: { RowSettings, Edit, gySource },
+  components: { RowSettings },
   props: {
     openPage: { type: String },
   },
   data() {
     return {
+      activeSeach: "",
       HModName: "Cg_POOrderBillList",
       editShow: false,
       openEdit: false,
       totalNameList: [],
+      dateRange: [],
       tableShow: true,
       openPrintList: false,
       printListShow: false,
@@ -721,7 +645,7 @@
       openData: false, //鏁版嵁寮圭獥
       dialogTitle: "",
       zuzhiId: "",
-      organizationList: [], //缁勭粐鍒楄〃
+      organizationList: JSON.parse(sessionStorage.getItem("organizationList")), //缁勭粐鍒楄〃
       subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
@@ -754,7 +678,7 @@
         ColContent1: "",
         ColContent2: "",
         ColContent: "",
-        timeSpan: 29,
+        HInitTimeCycle: 29,
         HBeginDate: dayjs(new Date()).subtract(29, "d").format("YYYY-MM-DDTHH:mm:ss"),
         HEndDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
       },
@@ -812,15 +736,11 @@
       uploadTotal: 0,
     };
   },
-  mounted() {
-    this.queryParams.HBeginDate = dayjs(new Date())
-      .subtract(29, "d")
-      .format("YYYY-MM-DDTHH:mm:ss");
-    this.queryParams.HEndDate = dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss");
-    this.fetchData();
+  mounted() {},
+  created() {
     this.riqiChange();
+    this.getList();
   },
-  created() {},
   methods: {
     onDateScanOptionChangerHandler(e) {
       this.queryParams.timeSpan = e;
@@ -897,17 +817,20 @@
       this.getList();
     },
     riqiChange() {
-      const end = new Date();
-      const start = new Date();
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
-      const yyyyS = start.getFullYear();
-      const mmS = String(start.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
-      const ddS = String(start.getDate()).padStart(2, "0");
-      const yyyyE = end.getFullYear();
-      const mmE = String(end.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
-      const ddE = String(end.getDate()).padStart(2, "0");
-      this.sTime = yyyyS + "-" + mmS + "-" + ddS;
-      this.eTime = yyyyE + "-" + mmE + "-" + ddE;
+      const end = dayjs(new Date()).format("YYYY-MM-DD");
+      const start = dayjs(new Date())
+        .subtract(this.queryParams.HInitTimeCycle, "d")
+        .format("YYYY-MM-DD");
+      // start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
+      // const yyyyS = start.getFullYear();
+      // const mmS = String(start.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
+      // const ddS = String(start.getDate()).padStart(2, "0");
+      // const yyyyE = end.getFullYear();
+      // const mmE = String(end.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
+      // const ddE = String(end.getDate()).padStart(2, "0");
+      this.sTime = start;
+      console.log(this.queryParams.HInitTimeCycle)
+      this.eTime = end;
       this.dateRange = [this.sTime, this.eTime];
     },
     organizationChange(val) {
@@ -982,11 +905,20 @@
       if (this.pageSize == 0) {
         this.pageSize = 50;
       }
+      this.queryParams.HOrgID = sessionStorage["OrganizationID"] - 0;
+
       // this.queryParams.HOrgID = 100038
       // this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
       // 鏀舵枡閫氱煡鍗曞垪琛�
+
+      if (this.dateRange.length > 0) {
+        this.sWhere +=
+          " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
+        this.sWhere +=
+          " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+      }
       try {
-        let res = await axios.get(this.baseURL + "Cg_POInStockBill/page", {
+        let res = await axios.get(this.baseURL + "/Xs_SeOutStockBill/list_byPage", {
           params: {
             sWhere: this.sWhere,
             user: this.user,
@@ -1450,7 +1382,7 @@
         .then(() => {
           if (!this.rowForm.瀹℃牳浜�) {
             axios
-              .get(this.baseURL + "Cg_POInStockBill/DeltetPOInStockBill", {
+              .get(this.baseURL + "/Xs_SeOutStockBill/DeltetSeOutStockBill", {
                 params: {
                   HInter: this.rowForm.hmainid.toString(),
                   HsupId: this.rowForm.HsupId,
@@ -1482,8 +1414,8 @@
       var InterID = form.HItemID || form.HInterID || form.hmainid;
       //閫昏緫瀹℃牳鏂规硶
       axios
-        .get(this.baseURL + "/Cg_POInStockBill/AuditCg_POInStockBill", {
-          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+        .get(this.baseURL + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
+          params: { HInterID: InterID, TypeError: num, CurUserName: this.user },
         })
         .then((res) => {
           let result = res.data;
@@ -1503,7 +1435,7 @@
       let HInterID = form.HItemID || form.HInterID || form.hmainid;
       try {
         let res = await axios.get(
-          `${this.baseURL}/Cg_POInStockBill/CloseCg_POInStockBill`,
+          `${this.baseURL}/Xs_SeOutStockBill/CloseXs_SeOutStockBill`,
           {
             params: {
               HInterID: HInterID,
@@ -1530,7 +1462,7 @@
       let HEntryID = form.HEntryID || form.hsubid;
       try {
         let res = await axios.get(
-          `${this.baseURL}/Cg_POInStockBill/CloseRowCg_POInStockBill`,
+          `${this.baseURL}/Xs_SeOutStockBill/CloseRowXs_SeOutStockBill`,
           {
             params: {
               HInterID: HInterID,
@@ -1557,7 +1489,7 @@
       let HInterID = form.HItemID || form.HInterID || form.hmainid;
       try {
         let res = await axios.get(
-          `${this.baseURL}/Cg_POInStockBill/DropCg_POInStockBill`,
+          `${this.baseURL}/Xs_SeOutStockBill/CancellXs_SeOutStockBill`,
           {
             params: {
               HInterID: HInterID,
diff --git a/src/views/cgPoInStockBill/index.vue b/src/views/sell/XsSeOutStockBill.vue
similarity index 87%
copy from src/views/cgPoInStockBill/index.vue
copy to src/views/sell/XsSeOutStockBill.vue
index e057ad3..74874b4 100644
--- a/src/views/cgPoInStockBill/index.vue
+++ b/src/views/sell/XsSeOutStockBill.vue
@@ -1,51 +1,70 @@
 <template>
   <div style="padding: 10px">
-    <el-drawer title="鏌ヨ" :visible.sync="searchOpen" :with-header="false" size="650px">
-      <div style="padding: 50px; width: 630px">
-        <div class="searchText">
-          <div style="font-size: 18px">QUICK SEARCH</div>
-          <div>蹇�熸悳绱�</div>
-          <div class="searchImg"></div>
-        </div>
-        <el-form :model="queryParams" ref="queryForm" label-width="98px">
-          <el-row>
-            <el-form-item label="鑱屽憳浠g爜" prop="HNumber">
-              <el-input
-                v-model="queryParams.HNumber"
-                placeholder="璇疯緭鍏ヨ亴鍛樹唬鐮�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="鑱屽憳鍚嶇О" prop="HName">
-              <el-input
-                v-model="queryParams.HName"
-                placeholder="璇疯緭鍏ヨ亴鍛樺悕绉�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="缁勭粐">
-              <el-select
-                v-model="queryParams.HOrgID"
-                placeholder="璇烽�夋嫨"
-                class="ForFilteringSchemes"
-              >
-                <el-option
-                  v-for="(item, index) in organizationList"
-                  :key="index"
-                  :label="item.Name"
-                  :value="item.ID"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-row>
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      label-width="78px"
+      class="searchBox"
+    >
+      <el-row>
+        <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+          <el-date-picker
+            v-model="dateRange"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="鏃ユ湡闂撮殧">
+          <el-select
+            v-model="queryParams.HInitTimeCycle"
+            placeholder="璇烽�夋嫨"
+            @change="riqiChange"
+          >
+            <el-option
+              v-for="(item, index) in rqsgList"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-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="缁勭粐">
+          <el-select
+            v-model="queryParams.HOrgID"
+            placeholder="璇烽�夋嫨"
+            class="ForFilteringSchemes"
+          >
+            <el-option
+              v-for="(item, index) in organizationList"
+              :key="index"
+              :label="item.Name"
+              :value="item.ID"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-row>
+
+      <el-collapse v-model="activeSeach">
+        <el-collapse-item title="鏇村" name="1">
           <el-card class="box-card">
             <div slot="header" class="clearfix"><span>杩囨护</span></div>
             <div>
-              <el-form-item label-width="0">
-                <el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName1"
@@ -86,10 +105,10 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName2"
@@ -131,10 +150,10 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName"
@@ -174,104 +193,23 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
+                </el-form-item>
+              </el-row>
             </div>
           </el-card>
-          <el-form-item label-width="78px" style="margin-top: 50px">
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">
-              鎼� 绱�</el-button
-            >
-            <el-button icon="el-icon-circle-close" @click="searchOpen = false"
-              >鍙� 娑�</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-drawer>
-    <el-row>
-      <el-form>
-        <el-col :span="4" class="inline">
-          <el-form-item label="鏃ユ湡闂撮殧" class="form-item-inline">
-            <el-select
-              v-model="queryParams.timeSpan"
-              placeholder="璇烽�夋嫨鏃ユ湡闂撮殧"
-              @change="onDateScanOptionChangerHandler"
-            >
-              <el-option
-                v-for="(item, index) in [
-                  {
-                    label: '浠绘剰闂撮殧',
-                    value: -1,
-                  },
-                  {
-                    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: 182,
-                  },
-                  {
-                    label: '杩戜竴骞�',
-                    value: 365,
-                  },
-                ]"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="寮�濮嬫棩鏈�" class="form-item-inline">
-            <el-date-picker
-              v-model="queryParams.HBeginDate"
-              :disabled="disableDataPicker"
-              value-format="yyyy-MM-DD"
-            ></el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="缁撴潫鏃ユ湡" class="form-item-inline">
-            <el-date-picker
-              v-model="queryParams.HEndDate"
-              :disabled="disableDataPicker"
-              value-format="yyyy-MM-DD"
-            ></el-date-picker>
-          </el-form-item>
-        </el-col>
-      </el-form>
-    </el-row>
+        </el-collapse-item>
+      </el-collapse>
+
+      <el-form-item label-width="78px">
+        <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">
+          鎼� 绱�</el-button
+        >
+        <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false"
+          >鍙� 娑�</el-button
+        >
+      </el-form-item>
+    </el-form>
+
     <el-row :gutter="10" class="mb8">
       <!-- <el-col :span="1.5">
         <el-button
@@ -286,7 +224,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAddEdit((OperationType = 1))"
@@ -296,8 +233,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -307,8 +243,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -318,8 +253,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
+          type="primary"
           icon="el-icon-delete"
           size="mini"
           :disabled="single"
@@ -329,23 +263,21 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
-          @click="set_CheckBill(0, (form = rowForm))"
+          @click="set_CheckBill(1, (form = rowForm))"
           >瀹℃牳</el-button
         >
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
-          @click="set_CheckBill(1, (form = rowForm))"
+          @click="set_CheckBill(2, (form = rowForm))"
           >鍙嶅鏍�</el-button
         >
       </el-col>
@@ -373,8 +305,7 @@
       </el-col> -->
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -384,8 +315,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -395,8 +325,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -406,8 +335,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -417,8 +345,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -428,8 +355,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -440,8 +366,7 @@
 
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
@@ -450,8 +375,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleRowHide"
@@ -464,7 +388,7 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
           >閲� 缃�</el-button
         >
       </el-col>
@@ -656,22 +580,22 @@
 <script>
 import axios from "axios";
 import RowSettings from "@/views/component/rowSettings";
-import Edit from "@/views/gyEmployee/edit";
-import gySource from "@/views/gySource";
 import dayjs from "dayjs";
 
 export default {
   name: "GySource",
-  components: { RowSettings, Edit, gySource },
+  components: { RowSettings },
   props: {
     openPage: { type: String },
   },
   data() {
     return {
+      activeSeach: "",
       HModName: "Cg_POOrderBillList",
       editShow: false,
       openEdit: false,
       totalNameList: [],
+      dateRange: [],
       tableShow: true,
       openPrintList: false,
       printListShow: false,
@@ -721,7 +645,7 @@
       openData: false, //鏁版嵁寮圭獥
       dialogTitle: "",
       zuzhiId: "",
-      organizationList: [], //缁勭粐鍒楄〃
+      organizationList: JSON.parse(sessionStorage.getItem("organizationList")), //缁勭粐鍒楄〃
       subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
@@ -812,15 +736,11 @@
       uploadTotal: 0,
     };
   },
-  mounted() {
-    this.queryParams.HBeginDate = dayjs(new Date())
-      .subtract(29, "d")
-      .format("YYYY-MM-DDTHH:mm:ss");
-    this.queryParams.HEndDate = dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss");
-    this.fetchData();
+  mounted() {},
+  created() {
     this.riqiChange();
+    this.getList();
   },
-  created() {},
   methods: {
     onDateScanOptionChangerHandler(e) {
       this.queryParams.timeSpan = e;
@@ -982,14 +902,26 @@
       if (this.pageSize == 0) {
         this.pageSize = 50;
       }
+      this.queryParams.HOrgID = sessionStorage["OrganizationID"]
+
       // this.queryParams.HOrgID = 100038
       // this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
       // 鏀舵枡閫氱煡鍗曞垪琛�
-      try {
-        let res = await axios.get(this.baseURL + "Cg_POInStockBill/page", {
+      
+      if (this.dateRange.length > 0) {
+        this.sWhere +=
+          " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
+        this.sWhere +=
+          " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+      }
+      console.log()
+      let Organization = this.organizationList.find(e => e.ID = this.queryParams.HOrgID)?.Name
+      try{
+        let res = await axios.get(this.baseURL + "/Xs_SeOutStockBill/list_byPage", {
           params: {
             sWhere: this.sWhere,
             user: this.user,
+            Organization: Organization,
             page: this.page,
             size: this.pageSize,
           },
@@ -1450,7 +1382,7 @@
         .then(() => {
           if (!this.rowForm.瀹℃牳浜�) {
             axios
-              .get(this.baseURL + "Cg_POInStockBill/DeltetPOInStockBill", {
+              .get(this.baseURL + "/Xs_SeOutStockBill/DeltetSeOutStockBill", {
                 params: {
                   HInter: this.rowForm.hmainid.toString(),
                   HsupId: this.rowForm.HsupId,
@@ -1482,8 +1414,8 @@
       var InterID = form.HItemID || form.HInterID || form.hmainid;
       //閫昏緫瀹℃牳鏂规硶
       axios
-        .get(this.baseURL + "/Cg_POInStockBill/AuditCg_POInStockBill", {
-          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+        .get(this.baseURL + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
+          params: { HInterID: InterID, TypeError: num, CurUserName: this.user },
         })
         .then((res) => {
           let result = res.data;
@@ -1503,7 +1435,7 @@
       let HInterID = form.HItemID || form.HInterID || form.hmainid;
       try {
         let res = await axios.get(
-          `${this.baseURL}/Cg_POInStockBill/CloseCg_POInStockBill`,
+          `${this.baseURL}/Xs_SeOutStockBill/CloseXs_SeOutStockBill`,
           {
             params: {
               HInterID: HInterID,
@@ -1530,7 +1462,7 @@
       let HEntryID = form.HEntryID || form.hsubid;
       try {
         let res = await axios.get(
-          `${this.baseURL}/Cg_POInStockBill/CloseRowCg_POInStockBill`,
+          `${this.baseURL}/Xs_SeOutStockBill/CloseRowXs_SeOutStockBill`,
           {
             params: {
               HInterID: HInterID,
@@ -1557,7 +1489,7 @@
       let HInterID = form.HItemID || form.HInterID || form.hmainid;
       try {
         let res = await axios.get(
-          `${this.baseURL}/Cg_POInStockBill/DropCg_POInStockBill`,
+          `${this.baseURL}/Xs_SeOutStockBill/CancellXs_SeOutStockBill`,
           {
             params: {
               HInterID: HInterID,
diff --git a/src/views/cgPoInStockBill/index.vue b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
similarity index 89%
rename from src/views/cgPoInStockBill/index.vue
rename to src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
index e057ad3..2330d2c 100644
--- a/src/views/cgPoInStockBill/index.vue
+++ b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
@@ -1,51 +1,70 @@
 <template>
   <div style="padding: 10px">
-    <el-drawer title="鏌ヨ" :visible.sync="searchOpen" :with-header="false" size="650px">
-      <div style="padding: 50px; width: 630px">
-        <div class="searchText">
-          <div style="font-size: 18px">QUICK SEARCH</div>
-          <div>蹇�熸悳绱�</div>
-          <div class="searchImg"></div>
-        </div>
-        <el-form :model="queryParams" ref="queryForm" label-width="98px">
-          <el-row>
-            <el-form-item label="鑱屽憳浠g爜" prop="HNumber">
-              <el-input
-                v-model="queryParams.HNumber"
-                placeholder="璇疯緭鍏ヨ亴鍛樹唬鐮�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="鑱屽憳鍚嶇О" prop="HName">
-              <el-input
-                v-model="queryParams.HName"
-                placeholder="璇疯緭鍏ヨ亴鍛樺悕绉�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="缁勭粐">
-              <el-select
-                v-model="queryParams.HOrgID"
-                placeholder="璇烽�夋嫨"
-                class="ForFilteringSchemes"
-              >
-                <el-option
-                  v-for="(item, index) in organizationList"
-                  :key="index"
-                  :label="item.Name"
-                  :value="item.ID"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-row>
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      label-width="78px"
+      class="searchBox"
+    >
+      <el-row>
+        <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+          <el-date-picker
+            v-model="dateRange"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="鏃ユ湡闂撮殧">
+          <el-select
+            v-model="queryParams.HInitTimeCycle"
+            placeholder="璇烽�夋嫨"
+            @change="riqiChange"
+          >
+            <el-option
+              v-for="(item, index) in rqsgList"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-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="缁勭粐">
+          <el-select
+            v-model="queryParams.HOrgID"
+            placeholder="璇烽�夋嫨"
+            class="ForFilteringSchemes"
+          >
+            <el-option
+              v-for="(item, index) in organizationList"
+              :key="index"
+              :label="item.Name"
+              :value="item.ID"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-row>
+
+      <el-collapse v-model="activeSeach">
+        <el-collapse-item title="鏇村" name="1">
           <el-card class="box-card">
             <div slot="header" class="clearfix"><span>杩囨护</span></div>
             <div>
-              <el-form-item label-width="0">
-                <el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName1"
@@ -86,10 +105,10 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName2"
@@ -131,10 +150,10 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
                     <el-select
                       v-model="queryParams.ColName"
@@ -174,104 +193,23 @@
                       class="ForFilteringSchemes"
                     />
                   </el-col>
-                </el-row>
-              </el-form-item>
+                </el-form-item>
+              </el-row>
             </div>
           </el-card>
-          <el-form-item label-width="78px" style="margin-top: 50px">
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">
-              鎼� 绱�</el-button
-            >
-            <el-button icon="el-icon-circle-close" @click="searchOpen = false"
-              >鍙� 娑�</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-drawer>
-    <el-row>
-      <el-form>
-        <el-col :span="4" class="inline">
-          <el-form-item label="鏃ユ湡闂撮殧" class="form-item-inline">
-            <el-select
-              v-model="queryParams.timeSpan"
-              placeholder="璇烽�夋嫨鏃ユ湡闂撮殧"
-              @change="onDateScanOptionChangerHandler"
-            >
-              <el-option
-                v-for="(item, index) in [
-                  {
-                    label: '浠绘剰闂撮殧',
-                    value: -1,
-                  },
-                  {
-                    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: 182,
-                  },
-                  {
-                    label: '杩戜竴骞�',
-                    value: 365,
-                  },
-                ]"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="寮�濮嬫棩鏈�" class="form-item-inline">
-            <el-date-picker
-              v-model="queryParams.HBeginDate"
-              :disabled="disableDataPicker"
-              value-format="yyyy-MM-DD"
-            ></el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="缁撴潫鏃ユ湡" class="form-item-inline">
-            <el-date-picker
-              v-model="queryParams.HEndDate"
-              :disabled="disableDataPicker"
-              value-format="yyyy-MM-DD"
-            ></el-date-picker>
-          </el-form-item>
-        </el-col>
-      </el-form>
-    </el-row>
+        </el-collapse-item>
+      </el-collapse>
+
+      <el-form-item label-width="78px">
+        <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">
+          鎼� 绱�</el-button
+        >
+        <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false"
+          >鍙� 娑�</el-button
+        >
+      </el-form-item>
+    </el-form>
+
     <el-row :gutter="10" class="mb8">
       <!-- <el-col :span="1.5">
         <el-button
@@ -286,7 +224,6 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
-          plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAddEdit((OperationType = 1))"
@@ -296,8 +233,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -307,8 +243,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -318,8 +253,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
+          type="primary"
           icon="el-icon-delete"
           size="mini"
           :disabled="single"
@@ -329,8 +263,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -340,8 +273,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -373,8 +305,7 @@
       </el-col> -->
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -384,8 +315,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -395,8 +325,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -406,8 +335,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -417,8 +345,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -428,8 +355,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
+          type="primary"
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
@@ -440,8 +366,7 @@
 
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
@@ -450,8 +375,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
+          type="primary"
           icon="el-icon-download"
           size="mini"
           @click="handleRowHide"
@@ -464,7 +388,7 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
           >閲� 缃�</el-button
         >
       </el-col>
@@ -656,22 +580,22 @@
 <script>
 import axios from "axios";
 import RowSettings from "@/views/component/rowSettings";
-import Edit from "@/views/gyEmployee/edit";
-import gySource from "@/views/gySource";
 import dayjs from "dayjs";
 
 export default {
   name: "GySource",
-  components: { RowSettings, Edit, gySource },
+  components: { RowSettings },
   props: {
     openPage: { type: String },
   },
   data() {
     return {
+      activeSeach: '',
       HModName: "Cg_POOrderBillList",
       editShow: false,
       openEdit: false,
       totalNameList: [],
+      dateRange: [],
       tableShow: true,
       openPrintList: false,
       printListShow: false,
@@ -812,15 +736,11 @@
       uploadTotal: 0,
     };
   },
-  mounted() {
-    this.queryParams.HBeginDate = dayjs(new Date())
-      .subtract(29, "d")
-      .format("YYYY-MM-DDTHH:mm:ss");
-    this.queryParams.HEndDate = dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss");
-    this.fetchData();
+  mounted() {},
+  created() {
     this.riqiChange();
+    this.getList();
   },
-  created() {},
   methods: {
     onDateScanOptionChangerHandler(e) {
       this.queryParams.timeSpan = e;
@@ -985,6 +905,12 @@
       // this.queryParams.HOrgID = 100038
       // this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
       // 鏀舵枡閫氱煡鍗曞垪琛�
+      if (this.dateRange.length > 0) {
+        this.sWhere +=
+          " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
+        this.sWhere +=
+          " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+      }
       try {
         let res = await axios.get(this.baseURL + "Cg_POInStockBill/page", {
           params: {
diff --git a/src/views/xsSeOrderBill/index.vue b/src/views/xsSeOrderBill/index.vue
deleted file mode 100644
index e057ad3..0000000
--- a/src/views/xsSeOrderBill/index.vue
+++ /dev/null
@@ -1,1717 +0,0 @@
-<template>
-  <div style="padding: 10px">
-    <el-drawer title="鏌ヨ" :visible.sync="searchOpen" :with-header="false" size="650px">
-      <div style="padding: 50px; width: 630px">
-        <div class="searchText">
-          <div style="font-size: 18px">QUICK SEARCH</div>
-          <div>蹇�熸悳绱�</div>
-          <div class="searchImg"></div>
-        </div>
-        <el-form :model="queryParams" ref="queryForm" label-width="98px">
-          <el-row>
-            <el-form-item label="鑱屽憳浠g爜" prop="HNumber">
-              <el-input
-                v-model="queryParams.HNumber"
-                placeholder="璇疯緭鍏ヨ亴鍛樹唬鐮�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="鑱屽憳鍚嶇О" prop="HName">
-              <el-input
-                v-model="queryParams.HName"
-                placeholder="璇疯緭鍏ヨ亴鍛樺悕绉�"
-                @keyup.enter.native="handleQuery"
-                class="ForFilteringSchemes"
-              />
-            </el-form-item>
-            <el-form-item label="缁勭粐">
-              <el-select
-                v-model="queryParams.HOrgID"
-                placeholder="璇烽�夋嫨"
-                class="ForFilteringSchemes"
-              >
-                <el-option
-                  v-for="(item, index) in organizationList"
-                  :key="index"
-                  :label="item.Name"
-                  :value="item.ID"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-row>
-          <el-card class="box-card">
-            <div slot="header" class="clearfix"><span>杩囨护</span></div>
-            <div>
-              <el-form-item label-width="0">
-                <el-row>
-                  <el-col :span="7">
-                    <el-select
-                      v-model="queryParams.ColName1"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
-                      <span v-for="(item, index) in btList" :key="index">
-                        <el-option
-                          :label="item.field"
-                          :value="item.field"
-                          v-if="!item.hide"
-                        ></el-option>
-                      </span>
-                    </el-select>
-                  </el-col>
-                  <el-col :span="6" style="padding: 0 10px">
-                    <el-select
-                      v-model="queryParams.Comparator1"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
-                      <el-option
-                        v-for="(item, index) in comparatorList"
-                        :key="index"
-                        :label="item.label"
-                        :value="item.value"
-                      ></el-option>
-                    </el-select>
-                  </el-col>
-                  <el-col :span="11">
-                    <el-input
-                      v-model="queryParams.ColContent1"
-                      placeholder="璇疯緭鍏�"
-                      clearable
-                      @keyup.enter.native="handleQuery"
-                      class="ForFilteringSchemes"
-                    />
-                  </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
-                  <el-col :span="7">
-                    <el-select
-                      v-model="queryParams.ColName2"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
-                      <span v-for="(item, index) in btList" :key="index">
-                        <el-option
-                          :label="item.field"
-                          :value="item.field"
-                          v-if="!item.hide"
-                        ></el-option>
-                      </span>
-                    </el-select>
-                  </el-col>
-                  <el-col :span="6" style="padding: 0 10px">
-                    <el-select
-                      v-model="queryParams.Comparator2"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
-                      <span v-for="(item, index) in btList" :key="index">
-                        <el-option
-                          :label="item.field"
-                          :value="item.field"
-                          v-if="!item.hide"
-                        ></el-option>
-                      </span>
-                    </el-select>
-                  </el-col>
-                  <el-col :span="11">
-                    <el-input
-                      v-model="queryParams.ColContent2"
-                      placeholder="璇疯緭鍏�"
-                      clearable
-                      @keyup.enter.native="handleQuery"
-                      class="ForFilteringSchemes"
-                    />
-                  </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
-                  <el-col :span="7">
-                    <el-select
-                      v-model="queryParams.ColName"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
-                      <el-option
-                        v-for="(item, index) in btList"
-                        :key="index"
-                        :label="item.field"
-                        :value="item.field"
-                      ></el-option>
-                    </el-select>
-                  </el-col>
-                  <el-col :span="6" style="padding: 0 10px">
-                    <el-select
-                      v-model="queryParams.Comparator"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
-                      <el-option
-                        v-for="(item, index) in comparatorList"
-                        :key="index"
-                        :label="item.label"
-                        :value="item.value"
-                      ></el-option>
-                    </el-select>
-                  </el-col>
-                  <el-col :span="11">
-                    <el-input
-                      v-model="queryParams.ColContent"
-                      placeholder="璇疯緭鍏�"
-                      clearable
-                      @keyup.enter.native="handleQuery"
-                      class="ForFilteringSchemes"
-                    />
-                  </el-col>
-                </el-row>
-              </el-form-item>
-            </div>
-          </el-card>
-          <el-form-item label-width="78px" style="margin-top: 50px">
-            <el-button type="primary" icon="el-icon-search" @click="handleQuery">
-              鎼� 绱�</el-button
-            >
-            <el-button icon="el-icon-circle-close" @click="searchOpen = false"
-              >鍙� 娑�</el-button
-            >
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-drawer>
-    <el-row>
-      <el-form>
-        <el-col :span="4" class="inline">
-          <el-form-item label="鏃ユ湡闂撮殧" class="form-item-inline">
-            <el-select
-              v-model="queryParams.timeSpan"
-              placeholder="璇烽�夋嫨鏃ユ湡闂撮殧"
-              @change="onDateScanOptionChangerHandler"
-            >
-              <el-option
-                v-for="(item, index) in [
-                  {
-                    label: '浠绘剰闂撮殧',
-                    value: -1,
-                  },
-                  {
-                    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: 182,
-                  },
-                  {
-                    label: '杩戜竴骞�',
-                    value: 365,
-                  },
-                ]"
-                :key="item.id"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="寮�濮嬫棩鏈�" class="form-item-inline">
-            <el-date-picker
-              v-model="queryParams.HBeginDate"
-              :disabled="disableDataPicker"
-              value-format="yyyy-MM-DD"
-            ></el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="缁撴潫鏃ユ湡" class="form-item-inline">
-            <el-date-picker
-              v-model="queryParams.HEndDate"
-              :disabled="disableDataPicker"
-              value-format="yyyy-MM-DD"
-            ></el-date-picker>
-          </el-form-item>
-        </el-col>
-      </el-form>
-    </el-row>
-    <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleImport"
-          >瀵煎叆</el-button
-        >
-      </el-col> -->
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAddEdit((OperationType = 1))"
-          id="btn-Add"
-          >鏂板</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleEdit((row = rowForm), (OperationType = 3))"
-          >缂栬緫</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleEdit((row = rowForm), (OperationType = 2))"
-          >澶嶅埗</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="single"
-          @click="handleDelete"
-          >鍒犻櫎
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="set_CheckBill(0, (form = rowForm))"
-          >瀹℃牳</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="set_CheckBill(1, (form = rowForm))"
-          >鍙嶅鏍�</el-button
-        >
-      </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="set_De_Stop(0, (form = rowForm))"
-          >绂佺敤</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="set_De_Stop(1, (form = rowForm))"
-          >鍙嶇鐢�</el-button
-        >
-      </el-col> -->
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="set_CloseBill(1, (form = rowForm))"
-          >鍏抽棴</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="set_CloseBill(2, (form = rowForm))"
-          >鍙嶅叧闂�</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="set_CloseRow(0, (form = rowForm))"
-          >琛屽叧闂�</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="set_CloseRow(1, (form = rowForm))"
-          >琛屽弽鍏抽棴</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="set_DropBill(1, (form = rowForm))"
-          >浣滃簾</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="set_DropBill(2, (form = rowForm))"
-          >鍙嶄綔搴�</el-button
-        >
-      </el-col>
-
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          >瀵煎嚭</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleRowHide"
-          >闅愯棌鍒楄缃�</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
-          >鎼� 绱�</el-button
-        >
-      </el-col>
-      <el-col :span="1.5">
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >閲� 缃�</el-button
-        >
-      </el-col>
-      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
-    </el-row>
-    <div class="tableBox" v-loading="loading">
-      <el-table
-        :data="tableData"
-        ref="tableData"
-        max-height="750"
-        :summary-method="getSummaries"
-        @selection-change="handleSelectionChange"
-        show-summary
-        border
-        @row-click="handleRowClick"
-        :row-style="rowStyle"
-        @cell-dblclick="handleDblclick"
-        v-if="tableShow"
-      >
-        <template v-for="(item, index) in btList">
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center"
-            :fixed="item.fixed"
-            v-if="item.type == 'checkbox'"
-            :key="index"
-          />
-          <el-table-column
-            :align="item.align"
-            :prop="item.field"
-            :label="item.title"
-            :width="item.width"
-            :key="item.sorderid"
-            v-else-if="!item.hide && item.type != 'checkbox'"
-            :sortable="item.sort"
-            show-overflow-tooltip
-            :fixed="item.fixed"
-          >
-            <template slot-scope="{ row, column }">
-              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
-              <div :style="item.style">
-                <span v-if="column.property.includes('鏃ユ湡')">{{
-                  parseTime(row[column.property], "{y}-{m}-{d}")
-                }}</span>
-                <el-button
-                  type="text"
-                  @click="handleEdit(row, (OperationType = 3))"
-                  v-else-if="column.property == '鍗曟嵁鍙�'"
-                  >{{ row.鍗曟嵁鍙� }}</el-button
-                >
-                <span v-else>{{ row[column.label] }}</span>
-              </div>
-            </template>
-          </el-table-column>
-        </template>
-      </el-table>
-      <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="page"
-        :limit.sync="pageSize"
-        :pageSizes="pageSizes"
-        @pagination="getList"
-      />
-      <el-dialog
-        title="闅愯棌鍒楄缃�"
-        :visible.sync="openRowHide"
-        width="816px"
-        append-to-body
-      >
-        <RowSettings
-          :colName="btResList"
-          :HModName="HModName"
-          @rowEditClose="rowSetClose"
-          v-if="rowHideShow"
-        />
-      </el-dialog>
-      <!-- 缂栬緫 -->
-      <el-dialog
-        title="缂栬緫鑱屽憳"
-        :visible.sync="openEdit"
-        width="1480px"
-        append-to-body
-        class="xsckdBox"
-        :before-close="close"
-      >
-        <edit
-          :OperationType="OperationType"
-          :linterid="this.rowForm.HItemID"
-          :HSouceBillType="this.rowForm.HSourceBillType"
-          :HOrgID="this.queryParams.HOrgID"
-          :copyType="copyType"
-          @editCloseGy="editGyClose"
-          v-if="editShow"
-        />
-      </el-dialog>
-      <el-dialog
-        :title="upload.title"
-        :visible.sync="upload.open"
-        width="1500px"
-        append-to-body
-      >
-        <div style="margin-top: -20px">
-          <el-button type="primary" @click="set_AddNew">瀵煎叆鏁版嵁</el-button>
-          <el-button type="primary" @click="upload.open = false">閫� 鍑�</el-button>
-          <el-upload
-            ref="upload"
-            :limit="1"
-            accept=".xlsx, .xls"
-            style="display: inline-block; margin-left: 10px"
-            :action="upload.url + '?updateSupport=' + upload.updateSupport"
-            :disabled="upload.isUploading"
-            :on-progress="handleFileUploadProgress"
-            :on-success="handleFileSuccess"
-          >
-            <el-button type="primary">鏂囦欢涓婁紶</el-button>
-          </el-upload>
-        </div>
-        <el-table
-          :data="uploadData"
-          v-loading="uploadTableLoading"
-          :row-class-name="uploadDataIndex"
-          border
-          height="550"
-        >
-          <el-table-column type="index" label="搴忓彿" width="55" align="center" />
-          <el-table-column label="缁勭粐浠g爜" prop="缁勭粐浠g爜" align="center" width="120" />
-          <el-table-column label="缁勭粐鍚嶇О" prop="缁勭粐鍚嶇О" align="center" width="120" />
-          <el-table-column
-            label="鐢熶骇璧勬簮鍚嶇О"
-            prop="鐢熶骇璧勬簮鍚嶇О"
-            align="center"
-            width="120"
-          />
-          <el-table-column
-            label="鐢熶骇璧勬簮浠g爜"
-            prop="鐢熶骇璧勬簮浠g爜"
-            align="center"
-            width="120"
-          />
-          <el-table-column label="閮ㄩ棬浠g爜" prop="閮ㄩ棬浠g爜" align="center" width="120" />
-          <el-table-column label="閮ㄩ棬鍚嶇О" prop="閮ㄩ棬鍚嶇О" align="center" width="120" />
-          <el-table-column
-            label="璐熻矗浜轰唬鐮�"
-            prop="璐熻矗浜轰唬鐮�"
-            align="center"
-            width="120"
-          />
-          <el-table-column label="璐熻矗浜�" prop="璐熻矗浜�" align="center" width="120" />
-          <el-table-column
-            label="宸ヤ綔涓績浠g爜"
-            prop="宸ヤ綔涓績浠g爜"
-            align="center"
-            width="120"
-          />
-          <el-table-column
-            label="宸ヤ綔涓績鍚嶇О"
-            prop="宸ヤ綔涓績鍚嶇О"
-            align="center"
-            width="120"
-          />
-          <el-table-column label="鍗曠彮宸ユ椂" prop="鍗曠彮宸ユ椂" align="center" width="120" />
-          <el-table-column label="鎿嶄綔" align="center">
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="uploadDataDelete(scope.row)"
-                >鍒犻櫎</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <pagination
-          v-show="uploadTotal > 0"
-          :total="uploadTotal"
-          :page.sync="uploadPage"
-          :limit.sync="uploadPageSize"
-          :pageSizes="uploadPageSizes"
-          @pagination="currentPage"
-        />
-      </el-dialog>
-    </div>
-  </div>
-</template>
-
-<script>
-import axios from "axios";
-import RowSettings from "@/views/component/rowSettings";
-import Edit from "@/views/gyEmployee/edit";
-import gySource from "@/views/gySource";
-import dayjs from "dayjs";
-
-export default {
-  name: "GySource",
-  components: { RowSettings, Edit, gySource },
-  props: {
-    openPage: { type: String },
-  },
-  data() {
-    return {
-      HModName: "Cg_POOrderBillList",
-      editShow: false,
-      openEdit: false,
-      totalNameList: [],
-      tableShow: true,
-      openPrintList: false,
-      printListShow: false,
-      HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
-      HBillType: "1202",
-      openBtnHide: false,
-      btnHideShow: false,
-      rowHideShow: false,
-      openRowHide: false,
-      copyType: 0,
-      comparatorList: [
-        { label: "=", value: "=" },
-        { label: ">=", value: ">=" },
-        { label: ">", value: ">" },
-        { label: "<=", value: "<=" },
-        { label: "<", value: "<" },
-        { label: "<>", value: "<>" },
-        { label: "鍖呭惈", value: "7" },
-        { label: "宸﹀寘鍚�", value: "8" },
-        { label: "鍙冲寘鍚�", value: "9" },
-        { label: "涓嶅寘鍚�", value: "10" },
-      ],
-      sWhere: "",
-      sTime: "",
-      eTime: "",
-      rqsgList: [
-        { label: "浠婂ぉ", value: 0 },
-        { label: "杩戜袱澶�", value: 1 },
-        { label: "杩戜笁澶�", value: 2 },
-        { label: "杩戝洓澶�", value: 3 },
-        { label: "杩戜簲澶�", value: 4 },
-        { label: "杩戝叚澶�", value: 5 },
-        { label: "杩戜竷澶�", value: 6 },
-        { label: "杩�30澶�", value: 29 },
-        { label: "杩戝崐骞�", value: 180 },
-        { label: "杩戜竴骞�", value: 365 },
-      ],
-      hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
-      addBtnShow: false,
-      zbIndex: null,
-      zbSelForm: {}, //瀛愯〃閫変腑鏁版嵁
-      dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
-      deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢
-      warehouseShow: false, //浠撳簱鏁版嵁缁勪欢
-      materialShow: false, //鐗╂枡鏁版嵁缁勪欢
-      deptform: {}, //寮圭獥閫変腑鏁版嵁
-      openData: false, //鏁版嵁寮圭獥
-      dialogTitle: "",
-      zuzhiId: "",
-      organizationList: [], //缁勭粐鍒楄〃
-      subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
-      OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
-      HInterID: null,
-      baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
-      user: "admin",
-      currentRow: [],
-      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
-      lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
-      selectedRow: null, // 褰撳墠閫変腑鐨勮
-      rowForm: {},
-      checkedSysZb: [],
-      editData: [], //鐢熶骇璧勬枡瀛愯〃
-      editBtData: [], //瀛愯〃琛ㄥご
-      activeName: "first",
-      searchOpen: false,
-      // 寮瑰嚭灞傛爣棰�
-      title: "",
-      // 鏄惁鏄剧ず寮瑰嚭灞�
-      open: false,
-      // 鏃ユ湡鑼冨洿
-      dateRange: [],
-      // 鏌ヨ鍙傛暟
-      queryParams: {
-        HOrgID: null,
-        HName: null,
-        HNumber: null,
-        Comparator1: "",
-        Comparator2: "",
-        Comparator: "",
-        ColContent1: "",
-        ColContent2: "",
-        ColContent: "",
-        timeSpan: 29,
-        HBeginDate: dayjs(new Date()).subtract(29, "d").format("YYYY-MM-DDTHH:mm:ss"),
-        HEndDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
-      },
-      // 鏄剧ず鎼滅储鏉′欢
-      showSearch: true,
-      // 閫変腑鏁扮粍
-      ids: [],
-      // 闈炲崟涓鐢�
-      single: true,
-      // 闈炲涓鐢�
-      multiple: true,
-      // 閬僵灞�
-      loading: true,
-      // 绂佺敤鏃ユ湡閫夋嫨
-      disableDataPicker: true,
-      tyResList: [], //鏀舵枡閫氱煡鍗曞垪琛紙鎺ュ彛鏁版嵁锛�
-      btList: [], //鏀舵枡閫氱煡鍗曞垪琛ㄦ樉绀�
-      btResList: [],
-      tableData: [], //鏀舵枡閫氱煡鍗曞垪琛�(鍒嗛〉鏄剧ず)
-      dataList: [],
-      titleData: ["HItemID", "Hprocid", "HUSEORGID", "HCREATEORGID", "HParentID"], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-      pageSizes: [50, 100, 500, 5000, 50000],
-      page: 1,
-      pageSize: 50,
-      total: 0,
-      scollHeight: document.body.clientHeight * (38.056 / 100),
-      // 琛ㄥ崟鍙傛暟
-      form: {},
-      // 琛ㄥ崟鏍¢獙
-      rules: {
-        HSupName: [{ required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }],
-        HDate: [{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }],
-        HExRate: [{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }],
-      },
-      upload: {
-        // 鏄惁鏄剧ず寮瑰嚭灞�
-        open: false,
-        // 寮瑰嚭灞傛爣棰�
-        title: "",
-        // 鏄惁绂佺敤涓婁紶
-        isUploading: false,
-        // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
-        updateSupport: 0,
-        // 璁剧疆涓婁紶鐨勮姹傚ご閮�
-        // headers: { Authorization: "Bearer " + getToken() },
-        // 涓婁紶鐨勫湴鍧�
-        url: "http://47.96.97.237/API/Gy_Source/Gy_Source_Excel",
-      },
-      uploadData: [],
-      alluploadList: [],
-      uploadTableLoading: false,
-      uploadPageSizes: [50, 100, 500, 5000, 50000],
-      uploadPage: 1,
-      uploadPageSize: 50,
-      uploadTotal: 0,
-    };
-  },
-  mounted() {
-    this.queryParams.HBeginDate = dayjs(new Date())
-      .subtract(29, "d")
-      .format("YYYY-MM-DDTHH:mm:ss");
-    this.queryParams.HEndDate = dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss");
-    this.fetchData();
-    this.riqiChange();
-  },
-  created() {},
-  methods: {
-    onDateScanOptionChangerHandler(e) {
-      this.queryParams.timeSpan = e;
-      if (e == -1) {
-        this.disableDataPicker = true;
-        return;
-      }
-
-      this.disableDataPicker = false;
-    },
-    getSummaries(param) {
-      const { columns, data } = param;
-      const sums = [];
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = "鍚堣";
-          return;
-        }
-        const values = data.map((item) => Number(item[column.property]));
-        if (this.totalNameList[index].totalRow) {
-          if (!values.every((value) => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0);
-          } else {
-            sums[index] = "";
-          }
-        }
-      }, 1000);
-      return sums;
-    },
-
-    //#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
-    defaintOperationByCompanyName() {
-      var result = false;
-      axios
-        .get(this.baseURL + "/Xt_getInfo/getCompanyName")
-        .then((res) => {
-          var data1 = res.data;
-          if (data1.count == 1) {
-            if (data1.data == "姘村姟") {
-              result = true;
-            }
-          }
-        })
-        .catch((error) => {
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-        });
-      return result;
-    },
-    handleSellOpen() {
-      this.$router.push("/sellBill");
-    },
-    handleSellOutOpen() {
-      this.$router.push("/sellOutBill");
-    },
-    handleBtnHide() {
-      this.btnHideShow = true;
-      this.openBtnHide = true;
-    },
-    handleRowHide() {
-      this.rowHideShow = true;
-      this.openRowHide = true;
-    },
-    rowSetClose(val) {
-      this.rowHideShow = false;
-      this.tableShow = true;
-      this.openRowHide = val;
-      this.getList();
-    },
-    riqiChange() {
-      const end = new Date();
-      const start = new Date();
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
-      const yyyyS = start.getFullYear();
-      const mmS = String(start.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
-      const ddS = String(start.getDate()).padStart(2, "0");
-      const yyyyE = end.getFullYear();
-      const mmE = String(end.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
-      const ddE = String(end.getDate()).padStart(2, "0");
-      this.sTime = yyyyS + "-" + mmS + "-" + ddS;
-      this.eTime = yyyyE + "-" + mmE + "-" + ddE;
-      this.dateRange = [this.sTime, this.eTime];
-    },
-    organizationChange(val) {
-      // let options=undefined
-      //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
-    },
-    //閮ㄩ棬寮圭獥璧嬪��
-    dbEmitData(deptRow, num) {
-      // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
-      if (num == 1) {
-        this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О;
-        this.form.HDeptID = deptRow.HItemID;
-        this.form.HEmpID = deptRow.HEmpID;
-        this.form.HManagerName = deptRow.璐熻矗浜�;
-        this.openData = false;
-      } else if (num == 2) {
-        this.editData[this.zbIndex].HWHID = deptRow.HItemID;
-        this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
-        this.openData = false;
-      } else if (num == 3) {
-        this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
-        this.editData[this.zbIndex].鐗╂枡浠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;
-      }
-    },
-    emitData(deptRow, num) {
-      this.dialogTypeNum = num;
-      this.deptform = deptRow;
-    },
-    deptClickSub() {
-      this.dbEmitData(this.deptform, this.dialogTypeNum);
-      this.deptform = {};
-    },
-    fetchData() {
-      //鐧诲綍鐢ㄦ埛淇℃伅
-      axios
-        .get(
-          "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
-        )
-        .then((res) => {
-          let data = res.data.data[0];
-          this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
-          this.queryParams.HOrgID = data.HUSEORGID;
-          this.user = data.Czymc;
-          axios
-            .get(this.baseURL + "/Web/GetOrganizations", {})
-            .then((res) => {
-              if (res.data.count == 1) {
-                this.organizationList = res.data.data; //缁勭粐鍒楄〃
-              }
-
-              this.handleQuery();
-              // this.getList();
-            })
-            .catch((error) => {
-              this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-            });
-        })
-        .catch((error) => {
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-        });
-    },
-    async getList() {
-      this.tableShow = false;
-      this.loading = true;
-      if (this.pageSize == 0) {
-        this.pageSize = 50;
-      }
-      // this.queryParams.HOrgID = 100038
-      // this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
-      // 鏀舵枡閫氱煡鍗曞垪琛�
-      try {
-        let res = await axios.get(this.baseURL + "Cg_POInStockBill/page", {
-          params: {
-            sWhere: this.sWhere,
-            user: this.user,
-            page: this.page,
-            size: this.pageSize,
-          },
-        });
-        this.tyResList = [...JSON.parse(JSON.stringify(res.data.data))]; //鎬绘暟鎹�
-        let data1 = res.data;
-        let option = [];
-        if (data1.code == 1) {
-          this.btResList = data1.list; //鐢熶骇璧勬枡鎺ュ彛琛ㄥご鏁版嵁
-          this.total = data1.count;
-          var data = []; //鍒楀瓧娈垫暟鎹�
-          var col = [];
-          var totalArray = [];
-          //缁欑┖鐨勬暟缁勮祴鍊�
-          for (var key in data1.list) {
-            //寰簭閬嶅巻鏁扮粍
-            data.push({
-              id: data1.list[key].ColmCols,
-              name: data1.list[key].ColmCols,
-              Type: data1.list[key].ColmType,
-            }); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
-          }
-          //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-          col.push({ type: "checkbox", fixed: "left", totalRowText: "鍚堣" });
-          for (var i = 0; i < data.length; i++) {
-            //閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
-            if (this.titleData.indexOf(data[i].name) > -1) {
-              //妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁$畻鍒�
-              col.push({
-                field: data[i].id,
-                title: data[i].name,
-                align: "center",
-                hide: true,
-              }); //闅愯棌id鍒�
-            } else if (
-              totalArray.indexOf(data[i].name) > -1 ||
-              data[i].Type == "Decimal" ||
-              data[i].Type == "Int32"
-            ) {
-              //璁$畻鍒�
-              col.push({
-                field: data[i].id,
-                title: data[i].name,
-                align: "center",
-                sort: true,
-                totalRow: true,
-                width: 120,
-              });
-            } else {
-              col.push({
-                field: data[i].id,
-                title: data[i].name,
-                align: "center",
-                sort: true,
-                width: 200,
-              });
-            }
-          }
-          option.cols = [col];
-          this.dataList = option;
-          option.data = data1.data;
-          var result = data1.data;
-          var temp = "";
-          for (var i = 0; i < result.length; i++) {
-            if (temp != result[i]["hmainid"]) {
-              temp = result[i]["hmainid"];
-            } else {
-              result[i].鏃ユ湡 = null;
-              result[i].鍗曟嵁鍙� = "";
-              /*result[i].鐘舵�� = "";*/
-              result[i].绾㈣摑鍗曟爣璁� = "";
-              result[i].hsupid = "";
-              result[i].瀹㈡埛 = "";
-              result[i].HEmpID = "";
-              result[i].涓氬姟鍛� = "";
-              result[i].hmanagerid = "";
-              result[i].涓荤 = "";
-              result[i].hsecmanagerid = "";
-              result[i].鍙戣揣浜� = "";
-              result[i].hkeeperid = "";
-              result[i].淇濈鍛� = "";
-              result[i].HDeptID = "";
-              result[i].閮ㄩ棬 = "";
-              result[i].閿�鍞柟寮� = "";
-            }
-          }
-          option.data = result;
-          this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
-        }
-      } catch (err) {
-        this.$modal.msgError(`鑾峰彇鏀舵枡閫氱煡鍗曢敊璇�: ${err}`);
-      }
-    },
-    DisPlay_HideColumn(HModName, user, option, dataOption) {
-      this.totalNameList = [];
-      axios
-        .get(this.baseURL + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
-          params: {
-            HModName: HModName,
-            user: user,
-          },
-        })
-        .then((res) => {
-          let data1 = res.data;
-          if (data1.data.length != 0) {
-            var dataCol = []; //鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-            var newCols = [[]]; //瀵瑰簲鏁版嵁搴撳垪椤哄簭col
-            newCols[0].push(option.cols[0][0]); //鏀惧叆绗竴涓猚heckbox
-            dataCol = data1.data[0].HGridString.split(",");
-            //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
-            if (dataCol.length == option.cols[0].length - 1) {
-              //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
-              for (var j = 0; j < option.cols[0].length - 1; j++) {
-                for (var i = 0; i < option.cols[0].length - 1; i++) {
-                  var dataCols = dataCol[j].split("|");
-                  //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
-                  if (option.cols[0][i + 1]["field"] == dataCols[5]) {
-                    //闅愯棌鍒�
-                    if (dataCols[1] == 1) {
-                      option.cols[0][i + 1]["hide"] = true;
-                    }
-                    //璁剧疆鍒楀
-                    if (dataCols[3] > 0) {
-                      option.cols[0][i + 1]["width"] = dataCols[3];
-                    }
-                    //璁剧疆鍐呭瀛椾綋澶у皬
-                    if (data1.data[0].HFontSize != 0) {
-                      option.cols[0][i + 1]["style"] =
-                        "font-size:" + data1.data[0].HFontSize + "px;";
-                    } else {
-                      option.cols[0][i + 1]["style"] = "font-size:100%";
-                    }
-                    //鏄剧ず鍒�
-                    if (
-                      dataCols[1] == 0 &&
-                      this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1
-                    ) {
-                      option.cols[0][i + 1]["hide"] = false;
-                    }
-                    //缁熻鍒�
-                    if (dataCols[6] == 1) {
-                      option.cols[0][i + 1]["totalRow"] = true;
-                    } else {
-                      option.cols[0][i + 1]["totalRow"] = false;
-                    }
-                    //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
-                    switch (dataCols[2]) {
-                      case "L":
-                        option.cols[0][i + 1]["align"] = "left";
-                        break;
-                      case "M":
-                        option.cols[0][i + 1]["align"] = "center";
-                        break;
-                      case "R":
-                        option.cols[0][i + 1]["align"] = "right";
-                        break;
-                    }
-                    //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
-                    if (dataCols[4] != null && dataCols[4] != "") {
-                      option.cols[0][i + 1]["title"] = dataCols[4];
-                    }
-                    newCols[0].push(option.cols[0][i + 1]);
-                    break;
-                  }
-                }
-              }
-              //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
-              if (dataCol.length == newCols[0].length - 1) {
-                option.cols = newCols;
-                //鍙栨秷鍐荤粨鍒�
-                for (var i = 1; i < option.cols[0].length - 1; i++) {
-                  if (option.cols[0][i + 1]["fixed"] != null) {
-                    option.cols[0][i + 1]["fixed"] = null;
-                  } else {
-                    break;
-                  }
-                }
-                //鍐荤粨鍒�
-                if (data1.data[0].HFixCols != 0) {
-                  for (var i = 0; i < data1.data[0].HFixCols; i++) {
-                    if (
-                      dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1
-                    ) {
-                      data1.data[0].HFixCols += 1;
-                    }
-
-                    option.cols[0][i + 1]["fixed"] = "left";
-                  }
-                }
-                //璁剧疆鍒楁帓搴�
-                for (var i = 1; i < option.cols[0].length; i++) {
-                  if (data1.data[0].HSortFlag == "鏄�") {
-                    option.cols[0][i]["sort"] = true;
-                  } else {
-                    option.cols[0][i]["sort"] = false;
-                  }
-                }
-              }
-            }
-            this.btList = option.cols[0];
-            this.btList.map((item) => {
-              if (!item.hide) {
-                this.totalNameList.push(item);
-              }
-            });
-            if (data1.data[0].HPageSize == 0) {
-              this.pageSize = 50;
-            } else {
-              this.pageSize = data1.data[0].HPageSize;
-            }
-            this.tableData = option.data;
-            this.tableShow = true;
-            this.loading = false;
-          } else {
-            this.btList = dataOption.cols[0];
-            this.btList.map((item) => {
-              if (!item.hide) {
-                this.totalNameList.push(item);
-              }
-            });
-            this.tableData = dataOption.data;
-            this.tableShow = true;
-            this.loading = false;
-          }
-        })
-        .catch((error) => {
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-        });
-    },
-    renderHeader(h, { column, $index }) {
-      // 鏂板缓涓�涓� span
-      let span = document.createElement(span); // 璁剧疆琛ㄥご鍚嶇О
-      span.innerText = column.label;
-      //涓存椂鎻掑叆 document
-      document.body.appendChild(span); // 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
-      document.body.removeChild(span);
-      return h(span, column.label);
-    },
-    //鐐瑰嚮琛�
-    handleRowClick(row, column, event) {
-      this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆¢�変腑鐨勮
-      this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
-      this.lastSelectedRowIndex = this.tableData.indexOf(row);
-      this.$refs.tableData.toggleRowSelection(row);
-    },
-    //閫変腑琛岄珮浜牱寮�
-    rowStyle({ row, rowIndex }) {
-      if (this.ids.includes(row.HItemID)) {
-        return { background: "#ecf5ff" };
-      }
-    },
-    //鍙屽嚮琛�
-    handleDblclick(row, column, cell, event) {
-      this.OperationType = 3;
-      this.handleEdit();
-    },
-    // 澶氶�夋閫変腑鏁版嵁
-    handleSelectionChange(selection) {
-      // this.rowForm = {}
-      this.ids = selection.map((item) => item.HItemID);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
-      if (!this.single) {
-        this.rowForm = selection[0];
-      }
-    },
-    //鎵撳紑渚ц竟鎼滅储寮圭獥
-    handleSearch() {
-      this.searchOpen = true;
-    },
-    /** 鎼滅储鎸夐挳鎿嶄綔 */
-    handleQuery() {
-      this.sWhere = "";
-      if (this.queryParams.ColName && this.queryParams.Comparator) {
-        var com = "";
-        switch (this.queryParams.Comparator) {
-          case "7":
-            com = "like'%" + this.queryParams.ColContent + "%'";
-            break;
-          case "8":
-            com = "like'%" + this.queryParams.ColContent + "'";
-            break;
-          case "9":
-            com = "like'" + this.queryParams.ColContent + "%'";
-            break;
-          case "10":
-            com = "not like'%" + this.queryParams.ColContent + "%'";
-            break;
-          default:
-            com =
-              "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
-            break;
-        }
-        this.sWhere += " and " + this.queryParams.ColName + " " + com;
-      }
-      if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
-        var com1 = "";
-        switch (this.queryParams.Comparator1) {
-          case "7":
-            com1 = "like'%" + this.queryParams.ColContent1 + "%'";
-            break;
-          case "8":
-            com1 = "like'%" + this.queryParams.ColContent1 + "'";
-            break;
-          case "9":
-            com1 = "like'" + this.queryParams.ColContent1 + "%'";
-            break;
-          case "10":
-            com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
-            break;
-          default:
-            com1 =
-              "" +
-              this.queryParams.Comparator1 +
-              "'" +
-              this.queryParams.ColContent1 +
-              "'";
-            break;
-        }
-        this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
-      }
-      if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
-        var com2 = "";
-        switch (this.queryParams.Comparator2) {
-          case "7":
-            com2 = "like'%" + this.queryParams.ColContent2 + "%'";
-            break;
-          case "8":
-            com2 = "like'%" + this.queryParams.ColContent2 + "'";
-            break;
-          case "9":
-            com2 = "like'" + this.queryParams.ColContent2 + "%'";
-            break;
-          case "10":
-            com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
-            break;
-          default:
-            com2 =
-              "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
-            break;
-        }
-        this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
-      }
-      if (this.queryParams.HNumber) {
-        this.sWhere += " and 鐢熶骇璧勬簮浠g爜 like '%" + this.queryParams.HNumber + "%'";
-      }
-      if (this.queryParams.HName) {
-        this.sWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + this.queryParams.HName + "%'";
-      }
-
-      if (this.queryParams.HBeginDate && this.queryParams.HEndDate) {
-        console.log(this.queryParams.HBeginDate, this.queryParams.HEndDate);
-        this.sWhere += `  and CONVERT(varchar(100),鏃ユ湡, 23) >= '${this.queryParams.HBeginDate}' and CONVERT(varchar(100),鏃ユ湡, 23) <= '${this.queryParams.HEndDate}'`;
-      }
-      if (this.queryParams.HOrgID) {
-        this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
-      }
-      this.sWhere += this.addSWhereByOpenType();
-      // this.sWhere += this.getOrgIDByUser();
-      this.searchOpen = false;
-      this.getList();
-    },
-    // 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
-    addSWhereByOpenType() {
-      //鑾峰彇鍙傛暟
-      var sWhere = "";
-      //this.openPage鍒ゆ柇鏄惁鏈夊�硷紝鏈変唬琛ㄥ叾瀹冮〉闈㈤�氳繃閫夋嫨鎸夐挳鎵撳紑
-      if (this.openPage) {
-        sWhere += " and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'')  != ''";
-        return sWhere;
-      }
-      return sWhere;
-    },
-    //鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
-    getOrgIDByUser() {
-      var res = "";
-      axios
-        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
-          params: {
-            HModName: this.HModName,
-            user: this.user,
-            HOrgID: this.zuzhiId,
-          },
-        })
-        .then((res) => {
-          let result = res.data;
-          if (result.count == 1) {
-            if (result.data[0].sWhere == "1") {
-              res = " and HUSEORGID = '" + this.zuzhiId + "'";
-            } else {
-              res = result.data[0].sWhere;
-            }
-          }
-        })
-        .catch((error) => {
-          res = " and 1 = 0";
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-        });
-      return res;
-    },
-    /** 閲嶇疆鎸夐挳鎿嶄綔 */
-    resetQuery() {
-      this.dateRange = [];
-      this.sWhere = "";
-      Object.assign(this.Parameters, {
-        HBillNo: "",
-        HInitTimeCycle: 29,
-        HProjectNumber: "",
-        HCusID: null,
-        HMaterNumber: "",
-        HMaterName: "",
-        ColName1: "",
-        ColName2: "",
-        ColName: "",
-        Comparator1: "",
-        Comparator2: "",
-        Comparator: "",
-        ColContent1: "",
-        ColContent2: "",
-        ColContent: "",
-      });
-      this.riqiChange();
-      this.resetForm("queryForm");
-      this.getList();
-    },
-
-    //閫�鍑�
-    close() {
-      this.tableShow = true;
-      this.openEdit = false;
-      this.getList();
-    },
-    //鎵撳紑鏂板缁勪欢寮圭獥
-    handleAddEdit() {
-      this.rowForm.HItemID = 0;
-      this.$nextTick(() => {
-        this.openEdit = true;
-        this.editShow = true;
-      });
-    },
-    //鎵撳紑淇敼缁勪欢寮圭獥
-    handleEdit() {
-      this.$nextTick(() => {
-        this.openEdit = true;
-        this.editShow = true;
-      });
-    },
-    //鍏抽棴缂栬緫椤甸潰
-    editGyClose(val) {
-      this.editShow = false;
-      this.openEdit = false;
-      (this.multiple = true), this.getList();
-    },
-    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-    handleDelete() {
-      this.$modal
-        .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
-        .then(() => {
-          if (!this.rowForm.瀹℃牳浜�) {
-            axios
-              .get(this.baseURL + "Cg_POInStockBill/DeltetPOInStockBill", {
-                params: {
-                  HInter: this.rowForm.hmainid.toString(),
-                  HsupId: this.rowForm.HsupId,
-                  HQty: this.rowForm.HQty,
-                  HSourceInterID: this.rowForm.HSourceInterID,
-                  HSourceEntryID: this.rowForm.HSourceEntryID,
-                  user: this.user,
-                },
-              })
-              .then((res) => {
-                if (res.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(() => {});
-    },
-    // 鍙嶅鏍�/瀹℃牳鏁版嵁
-    set_CheckBill(num, form) {
-      var InterID = form.HItemID || form.HInterID || form.hmainid;
-      //閫昏緫瀹℃牳鏂规硶
-      axios
-        .get(this.baseURL + "/Cg_POInStockBill/AuditCg_POInStockBill", {
-          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
-        })
-        .then((res) => {
-          let result = res.data;
-          if (result.code == 1) {
-            this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
-            this.getList();
-          } else {
-            this.$modal.msgError("閿欒:" + result.code + result.Message);
-          }
-        })
-        .catch((error) => {
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-        });
-    },
-    // 鍏抽棴/鍙嶅叧闂暟鎹�
-    async set_CloseBill(num, form) {
-      let HInterID = form.HItemID || form.HInterID || form.hmainid;
-      try {
-        let res = await axios.get(
-          `${this.baseURL}/Cg_POInStockBill/CloseCg_POInStockBill`,
-          {
-            params: {
-              HInterID: HInterID,
-              Type: num,
-              user: this.user,
-            },
-          }
-        );
-
-        let { data, Message, count } = res.data;
-
-        if (count == 1) {
-          this.handleQuery();
-        } else {
-          this.$modal.msgError(`${Message}`);
-        }
-      } catch (err) {
-        this.$modal.msgError(`鎺ュ彛璇锋眰澶辫触: ${err}`);
-      }
-    },
-    // 琛屽叧闂�/琛屽弽鍏抽棴鏁版嵁
-    async set_CloseRow(num, form) {
-      let HInterID = form.HItemID || form.HInterID || form.hmainid;
-      let HEntryID = form.HEntryID || form.hsubid;
-      try {
-        let res = await axios.get(
-          `${this.baseURL}/Cg_POInStockBill/CloseRowCg_POInStockBill`,
-          {
-            params: {
-              HInterID: HInterID,
-              HEntryID: HEntryID,
-              ISAudit: num,
-              CurUserName: this.user,
-            },
-          }
-        );
-
-        let { data, Message, count } = res.data;
-
-        if (count == 1) {
-          this.handleQuery();
-        } else {
-          this.$modal.msgError(`${Message}`);
-        }
-      } catch (err) {
-        this.$modal.msgError(`鎺ュ彛璇锋眰澶辫触: ${err}`);
-      }
-    },
-    // 浣滃簾/鍙嶄綔搴熸暟鎹�
-    async set_DropBill(num, form) {
-      let HInterID = form.HItemID || form.HInterID || form.hmainid;
-      try {
-        let res = await axios.get(
-          `${this.baseURL}/Cg_POInStockBill/DropCg_POInStockBill`,
-          {
-            params: {
-              HInterID: HInterID,
-              Type: num,
-              user: this.user,
-            },
-          }
-        );
-
-        let { data, Message, count } = res.data;
-
-        if (count == 1) {
-          this.handleQuery();
-        } else {
-          this.$modal.msgError(`${Message}`);
-        }
-      } catch (err) {
-        this.$modal.msgError(`鎺ュ彛璇锋眰澶辫触: ${err}`);
-      }
-    },
-    // 鍙嶇鐢�/绂佺敤鏁版嵁
-    set_De_Stop(num, form) {
-      var InterID = form.HItemID || form.HInterID;
-      //閫昏緫瀹℃牳鏂规硶
-      axios
-        .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
-          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
-        })
-        .then((res) => {
-          let result = res.data;
-          if (result.code == 1) {
-            this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
-            this.getList();
-          } else {
-            this.$modal.msgError("閿欒:" + result.code + result.Message);
-          }
-        })
-        .catch((error) => {
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-        });
-    },
-    //瀵煎嚭
-    handleExport() {
-      const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
-      const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
-      this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
-      this.$XLSX.writeFile(wb, `gySource_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
-    },
-    handleImport() {
-      this.uploadData = [];
-      this.upload.isUploading = false;
-      this.upload.title = "瀵煎叆";
-      this.upload.open = true;
-    },
-    // 鏂囦欢涓婁紶涓鐞�
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
-      this.uploadTableLoading = true;
-    },
-    // 鏂囦欢涓婁紶鎴愬姛澶勭悊
-    handleFileSuccess(res, file, fileList) {
-      // this.upload.open = false;
-      this.upload.isUploading = true;
-      this.$refs.upload.clearFiles();
-      if (res.code == 1) {
-        this.alluploadList = res.data;
-        this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
-        this.uploadTotal = this.alluploadList.length;
-        this.uploadTableLoading = false;
-        // this.set_AddNew(res.data)
-      } else {
-        this.$alert(
-          "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-            res.Message +
-            "</div>",
-          "瀵煎叆缁撴灉",
-          { dangerouslyUseHTMLString: true }
-        );
-      }
-    },
-    // 鎻愪氦涓婁紶鏂囦欢
-    submitFileForm() {
-      this.$refs.upload.submit();
-    },
-    set_AddNew() {
-      var num = [];
-      for (var i = 0; i < this.uploadData.length; i++) {
-        if (this.uploadData[i] != "") {
-          num.push(this.uploadData[i]);
-        }
-      }
-      var sSubStr = JSON.stringify(num);
-      var sMainSub = sSubStr + "&鍜�" + this.user;
-      axios({
-        method: "post",
-        url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
-        data: {
-          sMainSub: sMainSub,
-        },
-      })
-        .then((res) => {
-          this.$alert(
-            "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-              res.data.Message +
-              "</div>",
-            "瀵煎叆缁撴灉",
-            { dangerouslyUseHTMLString: true }
-          );
-          this.upload.open = false;
-          this.getList();
-        })
-        .catch((error) => {
-          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-        });
-    },
-    uploadDataIndex({ row, rowIndex }) {
-      row.index = rowIndex + 1;
-    },
-    uploadDataDelete(row) {
-      this.$modal
-        .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
-        .then(() => {
-          const deleteList = [row.index];
-          const data = this.uploadData;
-          this.uploadData = data.filter((item) => {
-            return deleteList.indexOf(item.index) == -1;
-          });
-        })
-        .catch(() => {});
-    },
-    getPage(page, list) {
-      let sindex = (parseInt(page) - 1) * this.uploadPageSize;
-      let eindex = parseInt(page) * this.uploadPageSize;
-      let newList = list.slice(sindex, eindex);
-      console.log(newList);
-      return newList;
-    },
-    currentPage(val) {
-      this.uploadPage = val.page;
-      setTimeout(() => {
-        this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
-      }, 100);
-    },
-  },
-};
-</script>
-<style>
-.xsckdBox .el-date-editor.el-input {
-  width: 100%;
-}
-
-.form-item-inline > .el-form-item__content {
-  display: flex;
-  flex-direction: row;
-  width: 60%;
-}
-</style>

--
Gitblit v1.9.1