From eb2f681a3e251e2738c5832f36ce553e77f4cbe1 Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期二, 25 十一月 2025 11:13:17 +0800
Subject: [PATCH] 器具领用/入库申请单以及其他器具页面微调

---
 src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue       |  855 ++++++++++++
 src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue         |   10 
 src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue |   26 
 src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue         |   10 
 src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue |   12 
 src/store/modules/permission.js                                  |   58 
 src/router/index.js                                              |   80 +
 .env.development                                                 |    4 
 src/views/ICMO/ScICMOBillList.vue                                |    6 
 src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue        |  855 ++++++++++++
 src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue        | 1021 +++++++++++++++
 src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue       | 1125 ++++++++++++++++
 src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue          |   10 
 13 files changed, 4,035 insertions(+), 37 deletions(-)

diff --git a/.env.development b/.env.development
index a0c89aa..233f7a7 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@
 ENV = 'development'
 
 # 鏅轰簯杩堟�滾-MOM绠$悊绯荤粺/寮�鍙戠幆澧�
-VUE_APP_BASE_API = 'http://localhost:81/API/'
-# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+# VUE_APP_BASE_API = 'http://localhost:81/API/'
+VUE_APP_BASE_API = 'http://47.96.97.237/API/'
 # 璺敱鎳掑姞杞�
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/router/index.js b/src/router/index.js
index 61543d8..7c15b92 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -774,7 +774,85 @@
       },
     ],
   },
-  //鍣ㄥ叿璋冩嫧鐢宠鍗曠淮鎶�
+  //鍣ㄥ叿鍏ュ簱鐢宠鍗曠淮鎶�
+  {
+    path: "/scMould/warehouse/Sc_MouldInRequestBillList",
+    component: Layout,
+    hidden: true,
+    // permissions: ["system:goods:add"],
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/scMould/warehouse/Sc_MouldInRequestBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/scMould/warehouse/Sc_MouldInRequestBillList",
+        component: () => import("@/views/scMould/warehouse/Sc_MouldInRequestBillList"),
+        name: "Sc_MouldInRequestBillList",
+        meta: { title: "鍣ㄥ叿鍏ュ簱鐢宠鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
+      },
+    ],
+  },
+  //鍣ㄥ叿鍏ュ簱鐢宠鍗�
+  {
+    path: "/scMould/warehouse/Sc_MouldInRequestBillEdit",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/scMould/warehouse/Sc_MouldInRequestBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/scMould/warehouse/Sc_MouldInRequestBillEdit",
+        component: () => import("@/views/scMould/warehouse/Sc_MouldInRequestBillEdit"),
+        name: "Sc_MouldInRequestBillEdit",
+        meta: { title: "鍣ㄥ叿鍏ュ簱鐢宠鍗曠紪杈�", activeMenu: "scMould/warehouse" },
+      },
+    ],
+  },
+    //鍣ㄥ叿棰嗙敤鐢宠鍗曠淮鎶�
+  {
+    path: "/scMould/warehouse/Sc_MouldOutRequestBillList",
+    component: Layout,
+    hidden: true,
+    // permissions: ["system:goods:add"],
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/scMould/warehouse/Sc_MouldOutRequestBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/scMould/warehouse/Sc_MouldOutRequestBillList",
+        component: () => import("@/views/scMould/warehouse/Sc_MouldOutRequestBillList"),
+        name: "Sc_MouldOutRequestBillList",
+        meta: { title: "鍣ㄥ叿棰嗙敤鐢宠鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
+      },
+    ],
+  },
+  //鍣ㄥ叿棰嗙敤鐢宠鍗�
+  {
+    path: "/scMould/warehouse/Sc_MouldOutRequestBillEdit",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/scMould/warehouse/Sc_MouldOutRequestBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/scMould/warehouse/Sc_MouldOutRequestBillEdit",
+        component: () => import("@/views/scMould/warehouse/Sc_MouldOutRequestBillEdit"),
+        name: "Sc_MouldOutRequestBillEdit",
+        meta: { title: "鍣ㄥ叿棰嗙敤鐢宠鍗曠紪杈�", activeMenu: "scMould/warehouse" },
+      },
+    ],
+  },
+    //鍣ㄥ叿璋冩嫧鐢宠鍗曠淮鎶�
   {
     path: "/scMould/warehouse/Sc_MouldMoveStockRequestBillList",
     component: Layout,
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 7ddc571..7f2e5b1 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -1018,6 +1018,64 @@
                       icon: "build",
                       link: null,
                       noCache: false,
+                      title: "鍣ㄥ叿鍏ュ簱鐢宠鍗曠淮鎶�",
+                    },
+                    component: () =>
+                      import(
+                        "@/views/scMould/warehouse/Sc_MouldInRequestBillList"
+                      ),
+                    hidden: false,
+                    name: "Sc_MouldInRequestBillList",
+                    path: "Sc_MouldInRequestBillList",
+                  },
+                  {
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "鍣ㄥ叿鍏ュ簱鐢宠鍗�",
+                    },
+                    component: () =>
+                      import(
+                        "@/views/scMould/warehouse/Sc_MouldInRequestBillEdit"
+                      ),
+                    hidden: false,
+                    name: "Sc_MouldInRequestBillEdit",
+                    path: "Sc_MouldInRequestBillEdit",
+                  },{
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "鍣ㄥ叿棰嗙敤鐢宠鍗曠淮鎶�",
+                    },
+                    component: () =>
+                      import(
+                        "@/views/scMould/warehouse/Sc_MouldOutRequestBillList"
+                      ),
+                    hidden: false,
+                    name: "Sc_MouldOutRequestBillList",
+                    path: "Sc_MouldOutRequestBillList",
+                  },
+                  {
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "鍣ㄥ叿棰嗙敤鐢宠鍗�",
+                    },
+                    component: () =>
+                      import(
+                        "@/views/scMould/warehouse/Sc_MouldOutRequestBillEdit"
+                      ),
+                    hidden: false,
+                    name: "Sc_MouldOutRequestBillEdit",
+                    path: "Sc_MouldOutRequestBillEdit",
+                  },{
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
                       title: "鍣ㄥ叿璋冩嫧鐢宠鍗曠淮鎶�",
                     },
                     component: () =>
diff --git a/src/views/ICMO/ScICMOBillList.vue b/src/views/ICMO/ScICMOBillList.vue
index 697f158..2ba18c5 100644
--- a/src/views/ICMO/ScICMOBillList.vue
+++ b/src/views/ICMO/ScICMOBillList.vue
@@ -1009,7 +1009,7 @@
       this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
       this.lastSelectedRowIndex = this.tableData.indexOf(row);
       this.$refs.tableData.toggleRowSelection(row);
-      if (this.openPage == 'Gy_BarCodeBill') {
+      if (this.openPage == 'Gy_BarCodeBill' || this.openPage == 'Sc_MouldOutRequestBill') {
         this.$emit('deptEmit', this.selRowList, 10)
       }
     },
@@ -1022,7 +1022,7 @@
     //鍙屽嚮琛�
     handleDblclick(row, column, cell, event) {
       this.OperationType = 3;
-      if (this.openPage == 'Gy_BarCodeBill') {
+      if (this.openPage == 'Gy_BarCodeBill' || this.openPage == 'Sc_MouldOutRequestBill') {
         let rowdata=[]
         rowdata.push(row)
         console.log(rowdata)
@@ -1042,7 +1042,7 @@
       if (!this.single) {
         this.rowForm = selection[0];
       }
-      if (this.openPage == 'Gy_BarCodeBill') {
+      if (this.openPage == 'Gy_BarCodeBill' || this.openPage == 'Sc_MouldOutRequestBill') {
         this.$emit('deptEmit', this.selRowList, 10)
       }
     },
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
new file mode 100644
index 0000000..33a7ad1
--- /dev/null
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -0,0 +1,1021 @@
+<template>
+  <div v-loading="formLoading" v-if="formShow">
+    <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
+      <!-- <el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button> -->
+      <el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
+      <!-- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button> -->
+      <el-button type="primary" @click="close">閫� 鍑�</el-button>
+      <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
+    </div>
+    <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍣ㄥ叿鍏ュ簱鐢宠鍗�</div>
+    <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+      <el-tabs v-model="activeName" type="card">
+        <el-tab-pane label="鍩烘湰淇℃伅" name="first">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+                <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鏃ユ湡" prop="HDate">
+                <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="缁勭粐" prop="HStockOrgID">
+                <el-select v-model="form.HStockOrgID" placeholder="璇烽�夋嫨缁勭粐">
+                  <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
+                <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+                  <el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+                <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨寰�鏉ュ崟浣�" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="閮ㄩ棬" prop="HDeptName">
+                <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1,deptType=1)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="浠撳簱" prop="HWHName">
+                <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨璋冨叆浠撳簱" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=1)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="涓氬姟鍛�" prop="HEmpName">
+                <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=1)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="涓荤" prop="HMangerName">
+                <el-input v-model="form.HMangerName" placeholder="璇烽�夋嫨" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=2)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="楠屾敹鍛�" prop="HSecManagerName">
+                <el-input v-model="form.HSecManagerName" placeholder="璇烽�夋嫨" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=3)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="淇濈鍛�" prop="HKeeperName">
+                <el-input v-model="form.HKeeperName" placeholder="璇烽�夋嫨" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=4)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="鎽樿" prop="HExplanation">
+                <el-input v-model="form.HExplanation" placeholder="璇疯緭鍏ユ憳瑕�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="澶囨敞" prop="HRemark">
+                <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="鍒跺崟淇℃伅" name="third">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鍒跺崟浜�" prop="HMaker">
+                <el-input v-model="form.HMaker" placeholder="璇疯緭鍏ュ埗鍗曚汉" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="淇敼浜�" prop="HUpDater">
+                <el-input v-model="form.HUpDater" placeholder="璇疯緭鍏ヤ慨鏀逛汉" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="瀹℃牳浜�" prop="HChecker">
+                <el-input v-model="form.HChecker" placeholder="璇疯緭鍏ュ鏍镐汉" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍏抽棴浜�" prop="HCloseMan">
+                <el-input v-model="form.HCloseMan" placeholder="璇疯緭鍏ュ叧闂汉" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鍒跺崟鏃ユ湡" prop="HMakeDate">
+                <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="淇敼鏃ユ湡" prop="HUpDateDate">
+                <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckDate">
+                <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍏抽棴鏃ユ湡" prop="HCloseDate">
+                <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="浣滃簾浜�" prop="HDeleteMan">
+                <el-input v-model="form.HDeleteMan" placeholder="璇疯緭鍏ヤ綔搴熶汉" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="浣滃簾鏃ユ湡" prop="HDeleteDate">
+                <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+      </el-tabs>
+
+      <el-tabs v-model="activeName1" type="border-card">
+        <el-tab-pane label="鏄庣粏淇℃伅" name="first">
+          <div style="margin-bottom: 10px;">
+            <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
+            <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
+              size="mini">鎻掑叆涓�琛�</el-button>
+            <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
+            <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
+              size="mini">涓婄Щ</el-button>
+            <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
+              size="mini">涓嬬Щ</el-button>
+          </div>
+          <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
+            @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column align="center" label="搴忓彿" type="index" width="80" />
+            <el-table-column align="center" label="鍣ㄥ叿浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HMaterNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(8, scope.row)"
+                  @dblclick.native="openDataDialog(8, scope.row)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="鍣ㄥ叿鍚嶇О" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HMaterName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HMaterModel }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璁¢噺鍗曚綅浠g爜" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HUnitNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璁¢噺鍗曚綅鍚嶇О" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HUnitName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="鏁伴噺" width="120">
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.HQty" :min="1" style="width: 90px;"
+                  controls-position="right"></el-input-number>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="浠撳簱浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HWHNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=2)"
+                  @dblclick.native="openDataDialog(2, scope.row ,eHWHType=2)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="浠撳簱鍚嶇О" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HWHName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="澶囨敞" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
+              <template slot-scope="scope">
+                <el-button type="danger" icon="el-icon-delete" size="mini" circle
+                  @click="handleDeleteSysZb(scope.row)"></el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+      
+    </el-form>
+    <!-- 寮圭獥 -->
+    <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+      <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="deptShow" />
+      <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
+      <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+      <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+      <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
+      <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
+      <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+        <el-button @click="deptClose">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+      <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import RowSettings from '@/views/component/rowSettings'
+import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import Dept from '@/views/basic/gy/gyDepartment'
+import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
+import GyCustomer from '@/views/GyCustomer'
+import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
+import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+import moment from 'moment';
+
+export default {
+  name: 'Sc_MouldInRequestBillEdit',
+  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
+  props: {
+    OperationType: { type: Number, },
+    linterid: { type: Number, },
+    HSouceBillType: { type: String, },
+    propsData: { type: String, },
+    copyType: { type: Number, },
+  },
+  data() {
+    return {
+      HModName: "Sc_MouldInRequestBill",
+      formShow: false,
+      temp: undefined,
+      formLoading: true,
+      rowHideShow: false,
+      openRowHide: false,
+      hSupTypeList: [{name:'渚涘簲鍟�',id:1,},{name:'瀹㈡埛',id:2},{name:'杞﹂棿閮ㄩ棬',id:3}],
+      addBtnShow: false,
+      zbIndex: null,
+      zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
+      dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+      deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
+      warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
+      gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+      gySupplierShow: false,//渚涘簲鍟嗘暟鎹粍浠�
+      gyCustomerShow: false,//瀹㈡埛鏁版嵁缁勪欢
+      gyMouldShow: false,//鍣ㄥ叿鏁版嵁缁勪欢
+      gyStockPlaceShow: false,//浠撲綅鏁版嵁缁勪欢
+      eHWHType:1,//浠撳簱寮圭獥鍖哄垎鏍囧織
+      empType:1,//鑱屽憳寮圭獥鍖哄垎鏍囧織
+      HSPType:1,//浠撲綅寮圭獥鍖哄垎鏍囧織
+      deptType:1,//閮ㄩ棬寮圭獥鍖哄垎鏍囧織
+      deptform: {},//寮圭獥閫変腑鏁版嵁
+      openData: false,//鏁版嵁寮圭獥
+      dialogTitle: '',
+      organizationList: [],//缁勭粐鍒楄〃
+      subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+      // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+      HInterID: 0,
+      baseURL: process.env.VUE_APP_BASE_API,
+      checkedSysZb: [],
+      editData: [],//瀛愯〃
+      editData1: [],//姹囨�诲瓙琛�
+      editBtData: [],//瀛愯〃琛ㄥご
+      activeName: 'first',
+      activeName1:'first',
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏃ユ湡鑼冨洿
+      dateRange: [],
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        HProjectNumber: '',
+        HCusID: null,
+        HMaterNumber: '',
+        HMaterName: '',
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      },
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 閬僵灞�
+      loading: true,
+      btResList: [],
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        HBillNo: [
+          { required: true, message: "鍗曟嵁鍙蜂笉鑳戒负绌�", trigger: "blur" }
+        ],
+        HDate: [
+          { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        HStockOrgID: [
+          { required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.fetchData()
+    this.getdata()
+  },
+  methods: {
+    fetchData() {
+      axios.get(this.baseURL + "/Web/GetOrganizations", {
+      }).then(response => {
+        if (response.data.count == 1) {
+          this.organizationList = response.data.data;//缁勭粐鍒楄〃
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    getdata() {
+      console.log(this.copyType, this.OperationType)
+      this.formShow = false
+      this.formLoading = true
+      if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
+        this.handleAdd()
+      } else if (this.OperationType == 2 || this.copyType == 1) {
+        this.handleUpdate()
+      }
+    },
+    // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+    getUrlVars_JSON() {
+      var datajson;
+      var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+      var arr = str.substring(str.lastIndexOf("=") + 1);
+      datajson = JSON.parse(decodeURI(arr));
+      return datajson;
+    },
+    handleRowHide() {
+      this.rowHideShow = true
+      this.openRowHide = true
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false
+      this.openRowHide = val
+    },
+
+    HStockOrgChange(val) {
+      console.log(549,val,this.zbIndex)
+      console.log(this.organizationList)
+      
+      // let options=undefined
+      //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+    },
+    //寮圭獥璧嬪��
+    dbEmitData(deptRow, num) {
+      // num=1閮ㄩ棬 num=2浠撳簱
+      console.log(deptRow)
+      if (deptRow.HItemID || deptRow.hmainid) {
+        if (num == 1) {
+          if(this.deptType == 1){
+            this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+            this.form.HDeptID = deptRow.HItemID
+          }else{
+            this.form.HSupName = deptRow.閮ㄩ棬鍚嶇О
+            this.form.HSupID = deptRow.HItemID
+          }
+          this.deptShow = false
+          this.openData = false
+        } else if (num == 2) {
+          if(this.eHWHType == 1){
+            this.form.HWHName = deptRow.浠撳簱鍚嶇О
+            this.form.HWHID = deptRow.HItemID
+            this.form.HWHNumber = deptRow.浠撳簱浠g爜
+          }else if(this.eHWHType == 2){
+            this.editData[this.zbIndex].HWHID = deptRow.HItemID
+            this.editData[this.zbIndex].HWHNumber = deptRow.浠撳簱浠g爜
+            this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
+          }
+          this.warehouseShow = false
+          this.openData = false
+        } else if (num == 4) {
+          if(this.empType == 1){
+            this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
+            this.form.HEmpID = deptRow.HItemID
+          }else if(this.empType == 2){
+            this.form.HMangerName = deptRow.鑱屽憳鍚嶇О
+            this.form.HMangerID = deptRow.HItemID
+          }else if(this.empType == 3){
+            this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
+            this.form.HSecManagerID = deptRow.HItemID
+          }else if(this.empType == 4){
+            this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
+            this.form.HKeeperID = deptRow.HItemID
+          }else
+          this.gyEmployeeShow = false
+          this.openData = false
+        } else if (num == 6) {
+          this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
+          this.form.HSupID = deptRow.HItemID
+          this.gySupplierShow = false
+          this.openData = false
+        } else if (num == 7) {
+          this.form.HSupName = deptRow.瀹㈡埛鍚嶇О
+          this.form.HSupID = deptRow.HItemID
+          this.gyCustomerShow = false
+          this.openData = false
+        } else if (num == 8){
+          this.editData[this.zbIndex].HMaterID = deptRow.hmainid
+          this.editData[this.zbIndex].HMaterNumber = deptRow.妯″叿缂栧彿
+          this.editData[this.zbIndex].HMaterName = deptRow.妯″叿鍚嶇О
+          this.editData[this.zbIndex].HMaterModel = deptRow.妯″叿鍨嬪彿
+          this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
+          this.editData[this.zbIndex].HUnitNumber = deptRow.璁¢噺鍗曚綅浠g爜
+          this.editData[this.zbIndex].HUnitName = deptRow.璁¢噺鍗曚綅
+          this.gyMouldShow = false
+          this.openData = false
+        } else if (num == 9){
+          if(this.HSPType == 1){
+            this.editData[this.zbIndex].HSPID = deptRow.HMainID
+            this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠g爜
+            this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
+          }else{
+            this.editData[this.zbIndex].HSCSPID = deptRow.HMainID
+            this.editData[this.zbIndex].HSCSPCode = deptRow.浠撲綅浠g爜
+            this.editData[this.zbIndex].HSCSPName = deptRow.浠撲綅鍚嶇О
+          }
+          this.gyStockPlaceShow = false
+          this.openData = false
+        }
+      } else {
+        this.$modal.msgError("璇烽�夋嫨鍗曟潯鏁版嵁!");
+      }
+
+    },
+    emitData(deptRow, num) {
+      this.dialogTypeNum = num
+      this.deptform = deptRow
+    },
+    deptClickSub() {
+      this.dbEmitData(this.deptform, this.dialogTypeNum)
+      this.deptform = {}
+    },
+    deptClose() {
+      this.deptform = {}
+      this.openData = false
+    },
+
+    //琛ㄥ崟鍒濆鍖�
+    reset() {
+      this.form = {
+        HBillNo: '',
+        HInterID: 0,
+        HDate: new Date(),
+        HStockOrgID:sessionStorage["OrganizationID"] - 0,
+        HSupTypeID:1,
+        HSupName:'',
+        HSupID:0,
+        HDeptName: '',
+        HDeptID: 0,
+        HWHName:'',
+        HWHNumber:'',
+        HWHID:0,
+        HEmpName:'',
+        HEmpID:'',
+        HMangerName:'',
+        HMangerID:'',
+        HSecManagerName:'',
+        HSecManagerID:'',
+        HKeeperName:'',
+        HKeeperID:'',
+        HExplanation:'',
+        HRemark:'',
+
+        HMaker: '',
+        HUpDater: '',
+        HChecker: '',
+        HMakeDate: new Date(),
+        HUpDateDate: '',
+        HCheckDate: '',
+        HCloseMan: '',
+        HDeleteMan: '',
+        HCloseDate: '',
+        HDeleteDate: '',
+      }
+      this.editData = []
+      this.editData1 = []
+      this.editBtData = []
+      this.ids = []
+      this.subDisabled = false
+      this.addBtnShow = false
+      // this.$refs.tableData.clearSelection()
+      this.activeName = 'first'
+      this.activeName1 = 'first'
+      this.resetForm("form");
+    },
+    //閫�鍑�
+    close() {
+      this.reset()
+      console.log(this.$route.path)
+      if (!this.OperationType && !this.copyType) {
+        console.log(this.$route.path)
+        const obj = { fullPath: this.$route.path, path: this.$route.path, name: this.$route.name, };
+        this.$tab.closePage(obj).then(res => {
+          const latestView = res.visitedViews.slice(-1)[0]
+          if (latestView) {
+            this.$router.push(latestView.fullPath)
+          } else {
+            if (obj.name === 'Dashboard') {
+              this.$router.replace({ path: '/redirect' + obj.fullPath })
+            } else {
+              this.$router.push('/')
+            }
+          }
+        });
+      } else {
+        this.formShow = false
+        this.$emit('editClose', false)
+      }
+    },
+    //鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
+    getCzyglByUser() {
+      axios.get(this.baseURL + '/Xs_SeOrderBill/getCzyglByUser', {
+        params: { "CurUserName": sessionStorage["HUserName"] }
+      }).then(response => {
+        let dataForm = response.data.data[0]
+        this.form.HDeptID = dataForm.HDeptID
+        this.form.HDeptName = dataForm.HDeptName
+        this.form.HEmpID = dataForm.HEmpID
+        this.form.HEmpName = dataForm.HEmpName
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset()
+      //鏂板鑾峰彇鍗曟嵁鍙�
+      this.getHBillNo()
+      let date = new Date()
+      this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+      if (this.OperationType == 1) {
+        this.handleAddSysZb()
+      }
+      this.$nextTick(() => {
+        this.formShow = true
+        this.formLoading = false
+      })
+    },
+    getHBillNo() {
+      axios.get(this.baseURL + "/WEBSController/GetMaxBillNo_Json", {
+        params: {
+          HBillType: '3851'
+        }
+      }).then(response => {
+        this.form.HMaker = sessionStorage["HUserName"]
+        this.form.HBillNo = response.data.data[0].HBillNo
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate() {
+      this.reset()
+      let rowHmainid = this.linterid
+      console.log(this.linterid)
+      //涓昏〃
+      axios.get(this.baseURL + "/Sc_MouldInRequestBillController/GetSc_MouldInRequestBill_Json", {
+        params: { 'HInterID': rowHmainid,'HMaker':sessionStorage["HUserName"] }
+      }).then(response => {
+        if (response.data.count == 1) {
+          var result = response.data
+          var data = response.data.data[0]
+          console.log(result,data)
+          if (this.copyType == 1) {
+            this.getHBillNo()
+            let date = new Date()
+            this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+          } else {
+            this.form = {
+                  "HBillNo": data.鍗曟嵁鍙�
+                , "HDate": data.鏃ユ湡
+                , "HSupTypeID": data.HSupTypeID
+                , "HSupID": data.HSupID
+                , "HSupName": data.寰�鏉ュ崟浣�
+                , "HDeptID": data.HDeptID
+                , "HDeptName": data.閮ㄩ棬
+                , "HWHID": data.HWHID
+                , "HWHName": data.浠撳簱
+                , "HEmpID": data.HEmpID
+                , "HEmpName": data.涓氬姟鍛�
+                , "HMangerID": data.HMangerID
+                , "HMangerName": data.涓荤
+                , "HSecManagerID": data.HSecManagerID
+                , "HSecManagerName": data.楠屾敹鍛�
+                , "HKeeperID": data.HKeeperID
+                , "HKeeperName": data.淇濈鍛�
+                , "HExplanation": data.鎽樿
+                , "HRemark": data.琛ㄥご澶囨敞
+                , "HStockOrgID": data.HStockOrgID
+                
+                , "HMaker": data.鍒跺崟浜�
+                , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
+                , "HChecker": data.瀹℃牳浜�
+                , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : data.瀹℃牳鏃ユ湡
+                , "HUpDater": data.淇敼浜�
+                , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : data.淇敼鏃ユ湡
+                , "HCloseMan": data.鍏抽棴浜�
+                , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : data.鍏抽棴鏃ユ湡
+                , "HDeleteMan": data.浣滃簾浜�
+                , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : data.浣滃簾鏃ユ湡
+            }
+            this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID;
+
+            //瀛愯〃
+            var rowdata = [];
+            for (let i = 0; i < result.data.length; i++) {
+              rowdata.push(
+                  {
+                    "HMaterID": result.data[i].HMaterID
+                    , "HMaterNumber": result.data[i].HMaterNumber
+                    , "HMaterName": result.data[i].HMaterName
+                    , "HMaterModel": result.data[i].HMaterModel
+                    , "HPropertyID": result.data[i].HProcID
+                    , "HSecUnitID": result.data[i].HSecUnitID
+                    , "HSecUnitRate": result.data[i].HSecUnitRate
+                    , "HUnitID": result.data[i].HUnitID
+                    , "HUnitNumber": result.data[i].HUnitNumber
+                    , "HUnitName": result.data[i].HUnitName
+                    , "HQtyMust": result.data[i].HQtyMust
+                    , "HQty": result.data[i].HQty
+                    , "HPrice": result.data[i].HPrice
+                    , "HMoney": result.data[i].HMoney
+                    , "HWHID": result.data[i].HWHID
+                    , "HWHNumber": result.data[i].HWHNumber
+                    , "HWHName": result.data[i].HWHName
+                    , "HSPID": result.data[i].HSPID
+                    , "HSPNumber": result.data[i].HSPNumber
+                    , "HSPName": result.data[i].HSPName
+                    , "HERPInterID": result.data[i].HERPInterID
+                    , "HERPEntryID": result.data[i].HERPEntryID
+                    , "HPOOrderInterID": result.data[i].HPOOrderInterID
+                    , "HPOOrderEntryID": result.data[i].HPOOrderEntryID
+                    , "HPOOrderBillNo": result.data[i].HPOOrderBillNo
+                    , "HSeOrderInterID": result.data[i].HSeOrderInterID
+                    , "HSeOrderEntryID": result.data[i].HSeOrderEntryID
+                    , "HSeOrderBillNo": result.data[i].HSeOrderBillNo
+                    , "HICMOInterID": result.data[i].HICMOInterID
+                    , "HICMOEntryID": result.data[i].HICMOEntryID
+                    , "HICMOBillNo": result.data[i].HICMOBillNo
+                    , "HSTOCKORGID": result.data[i].HSubSTOCKORGID
+                    , "HOWNERID": result.data[i].HOWNERID
+                    , "HOWNERTYPEID": result.data[i].HOWNERTYPEID
+                    , "HSEQ": result.data[i].HSEQ
+                    , "HSTOCKSTATUSID": result.data[i].HSTOCKSTATUSID
+                    , "HSourceBillType": result.data[i].HSourceBillType
+                    , "HSourceInterID": result.data[i].HSourceInterID
+                    , "HSourceEntryID": result.data[i].HSourceEntryID
+                    , "HSourceBillNo": result.data[i].HSourceBillNo
+                    , "HRelationQty": result.data[i].HRelationQty
+                    , "HRelationMoney": result.data[i].HRelationMoney
+                    , "HRemark": result.data[i].HRemark
+                  }
+              )
+            }
+            this.editData = rowdata
+          }
+          this.formShow = true
+          this.formLoading = false
+        }
+      }).catch(error => {
+        console.log(error)
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    /** 瀛愯〃鏄庣粏搴忓彿 */
+    rowSysZbIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** 缂栬緫椤靛瓙琛ㄦ坊鍔犳寜閽搷浣� */
+    handleAddSysZb(index, num) {
+      if (num == 1 && !index) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
+      } else {
+        let obj = {
+          "HMaterID": "0"
+          , "HMaterNumber": ""
+          , "HMaterName": ""
+          , "HMaterModel": ""
+          , "HUnitID": "0"
+          , "HUnitNumber": ""
+          , "HUnitName": ""
+          , "HQty": "0"
+          , "HWHID": "0"
+          , "HWHNumber": ""
+          , "HWHName": ""
+          , "HSPID": "0"
+          , "HSPNumber": ""
+          , "HSPName": ""
+          , "HSourceInterID": "0"
+          , "HSourceEntryID": "0"
+          , "HSourceBillType": ""
+          , "HSourceBillNo": ""
+          , "HRelationQty": "0"
+          , "HRelationMoney": "0"
+          , "HRemark": ""
+          , "HPropertyID": "0"
+          , "HSecUnitID": "0"
+          , "HSecUnitRate": "0"
+          , "HQtyMust": "0"
+          , "HPrice": "0"
+          , "HMoney": "0"
+          , "HERPInterID": "0"
+          , "HERPEntryID": "0"
+          , "HPOOrderInterID": "0"
+          , "HPOOrderEntryID": "0"
+          , "HPOOrderBillNo": ""
+          , "HSeOrderInterID": "0"
+          , "HSeOrderEntryID": "0"
+          , "HSeOrderBillNo": ""
+          , "HICMOInterID": "0"
+          , "HICMOEntryID": "0"
+          , "HICMOBillNo": ""
+          , "HSTOCKORGID": this.form.HStockOrgID
+          , "HOWNERID": this.form.HStockOrgID
+          , "HOWNERTYPEID": ""
+          , "HSEQ": "0"
+          , "HSTOCKSTATUSID": "0"
+        }
+        if (index) {
+          this.editData.splice(index, 0, obj);
+          this.$set(this.editData, index, obj)
+        } else {
+          this.editData.push(obj);
+        }
+      }
+    },
+    handleCopyZbRow() {
+      if (!this.zbIndex) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else {
+        let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+        this.editData.push(copyRow);
+      }
+    },
+    handleMoveRowUp(zbSelForm) {
+      if (!this.zbIndex) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else {
+        if (zbSelForm.index == 1) {
+          this.$modal.msgError("绗竴琛屾暟鎹棤娉曚笂绉�");
+        } else { // 纭繚涓嶆槸绗竴琛�
+          let num = zbSelForm.index - 1
+          const record = this.editData.splice(num, 1)[0];
+          this.editData.splice(num - 1, 0, record);
+        }
+      }
+    },
+    handleMoveRowDown(zbSelForm) {
+      if (!this.zbIndex) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else {
+        if (zbSelForm.index == this.editData.length) {
+          this.$modal.msgError("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉�");
+        } else { // 纭繚涓嶆槸绗竴琛�
+          let num = zbSelForm.index - 1
+          const record = this.editData.splice(num, 1)[0];
+          this.editData.splice(num + 1, 0, record);
+        }
+      }
+    },
+    /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
+    handleDeleteSysZb(row) {
+      this.checkedSysZb = []
+      this.checkedSysZb.push(row.index)
+      if (this.checkedSysZb.length == 0) {
+        this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑鍟嗗搧璁㈠崟鏄庣粏鏁版嵁");
+      } else {
+        const editData = this.editData;
+        const checkedSysZb = this.checkedSysZb;
+        this.editData = editData.filter(function (item) {
+          return checkedSysZb.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
+    handleTableZbEdit(selection) {
+      this.checkedSysZb = selection.map(item => item.index)
+      this.zbSelForm = selection[0]
+      this.zbIndex = this.checkedSysZb[0]
+      if (selection.length > 1) {
+        const del_row = selection.shift()
+        this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+      }
+    },
+    // 缂栬緫鎻愪氦淇濆瓨
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let fhck = false
+          if(this.editData.length == 0){
+              fhck = true
+              this.$modal.msgError("娌℃湁鐗╂枡鏄庣粏璁板綍锛�");
+          }
+          this.editData.map((item, index) => {
+            if (!item.HMaterID) {
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
+            }else if(!item.HQty || item.HQty == 0){
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+            }
+          })
+          this.$nextTick(() => {
+            if (!fhck) {
+              var Operation = null
+              if(!this.OperationType){
+                Operation = 1
+              }else{
+                Operation = this.OperationType
+                if(Operation == 2){
+                  this.form.HInterID = this.linterid
+                }
+              }
+              var sMainStr = JSON.stringify(this.form);
+              var sSubStr = JSON.stringify(this.editData);
+              var sMainSub = sMainStr + ';' + sSubStr + ';' + Operation + ";" + sessionStorage["HUserName"];
+              axios({
+                method: 'post',
+                url: this.baseURL + "/Sc_MouldInRequestBillController/GetSc_MouldInRequestBill_Save_Json",
+                data: {
+                  'sMainSub': sMainSub
+                },
+              }).then(response => {
+                if (response.data.count == 1) {
+                  this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+                  this.$modal.msgSuccess(response.data.Message);
+                  // if (response.data.Verify == "Y") //鑷姩瀹℃牳
+                  // {
+                  //   this.set_CheckBill(1, this.form); //瀹℃牳
+                  // }
+                  this.addBtnShow = true
+                  this.close()
+                } else {
+                  this.$modal.msgError(response.data.code + response.data.Message);
+                }
+              }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+              });
+            }
+          })
+        }
+      });
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.hmainid || form.HInterID
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Sc_MouldProdMoveBill/AuditMouldProdMoveBill", {
+        params: { "HInterID": InterID, "flag": num, "user": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.code == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    showReset() {
+      this.deptShow = false
+      this.warehouseShow = false
+      this.gyEmployeeShow = false
+      this.gySupplierShow = false
+      this.gyCustomerShow = false
+      this.gyMouldShow = false
+      this.gyStockPlaceShow = false
+    },
+    //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
+    openDataDialog(num, row) {
+      //num1閮ㄩ棬锛�2鍑哄簱浠撳簱锛�3鐗╂枡锛�4閿�鍞憳
+      if (row) {
+        this.zbIndex = row.index - 1
+      }
+      this.showReset()
+      if (num == 1) {
+        this.dialogTitle = '閮ㄩ棬鍒楄〃'
+        this.deptShow = true
+        this.openData = true
+      } else if (num == 2) {
+        this.dialogTitle = '浠撳簱鍒楄〃'
+        this.warehouseShow = true
+        this.openData = true
+      } else if (num == 4) {
+        if(this.empType == 1){
+          this.dialogTitle = '涓氬姟鍛樺垪琛�'
+        }else if(this.empType == 2){
+          this.dialogTitle = '涓荤鍒楄〃'
+        }else if(this.empType == 3){
+          this.dialogTitle = '楠屾敹鍛樺垪琛�'
+        }else if(this.empType == 4){
+          this.dialogTitle = '淇濈鍛樺垪琛�'
+        }
+        this.gyEmployeeShow = true
+        this.openData = true
+      } else if (num == 6) {
+        this.dialogTitle = '渚涘簲鍟嗗垪琛�'
+        this.gySupplierShow = true
+        this.openData = true
+      }  else if (num == 7) {
+        this.dialogTitle = '瀹㈡埛鍒楄〃'
+        this.gyCustomerShow = true
+        this.openData = true
+      }  else if (num == 8) {
+        this.dialogTitle = '鍣ㄥ叿鍒楄〃'
+        this.gyMouldShow = true
+        this.openData = true
+      }  else if (num == 9) {
+        this.dialogTitle = '浠撲綅鍒楄〃'
+        this.gyStockPlaceShow = true
+        this.openData = true
+      } 
+    },
+    //鏍规嵁寰�鏉ョ被鍨嬪垽鏂線鏉ュ崟浣�
+    openDataDialogChoose(){
+      if(this.form.HSupTypeID == 1){
+        this.openDataDialog(6)
+      }else if(this.form.HSupTypeID == 2){
+        this.openDataDialog(7)
+      }else if(this.form.HSupTypeID == 3){
+        this.deptType = 2
+        this.openDataDialog(1)
+      }
+    }
+  }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
new file mode 100644
index 0000000..3253ada
--- /dev/null
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
@@ -0,0 +1,855 @@
+<template>
+  <div style="padding: 10px;">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
+      <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px;">
+        <el-date-picker v-model="sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="缁撴潫鏃ユ湡">
+        <el-date-picker v-model="eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="鏃ユ湡闂撮殧">
+        <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange" style="width: 150px;">
+          <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+        <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label-width="78px">
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"> 鎼� 绱�</el-button>
+        <el-button icon="el-icon-circle-close" @click="resetQuery">閲� 缃�</el-button>
+      </el-form-item>
+      <el-collapse v-model="activeSeach">
+        <el-collapse-item title="鏇村" name="1">
+          <el-card class="box-card">
+            <el-form-item label="鐘舵��" prop="HStatus">
+              <el-select v-model="queryParams.HStatus" placeholder="璇烽�夋嫨鐘舵��">
+                <el-option v-for="(item, index) in HStatusList" :key="index" :label="item.name" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="缁勭粐">
+              <el-select v-model="queryParams.HStockOrgID" placeholder="璇烽�夋嫨">
+                <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="閮ㄩ棬淇℃伅" prop="HDept">
+              <el-input v-model="queryParams.HDept" placeholder="璇疯緭鍏ラ儴闂ㄤ俊鎭�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="鍣ㄥ叿浠g爜" prop="HModelNumber">
+              <el-input v-model="queryParams.HModelNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+              <el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <div slot="header" class="clearfix"><span>杩囨护</span></div>
+            <div>
+              <el-row>
+                <el-form-item label-width="0">
+                  <el-row>
+                    <el-col :span="7">
+                      <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <span v-for="(item, index) in btList" :key="index">
+                          <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+                        </span>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="6" style="padding: 0 10px;">
+                      <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+                          :value="item.value"></el-option>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="11">
+                      <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
+                        @keyup.enter.native="handleQuery" />
+                    </el-col>
+                  </el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
+                  <el-row>
+                    <el-col :span="7">
+                      <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <span v-for="(item, index) in btList" :key="index">
+                          <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+                        </span>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="6" style="padding: 0 10px;">
+                      <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+                          :value="item.value"></el-option>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="11">
+                      <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
+                        @keyup.enter.native="handleQuery" />
+                    </el-col>
+                  </el-row>
+                </el-form-item>
+              </el-row>
+              <el-form-item label-width="0">
+                <el-row>
+                  <el-col :span="7">
+                    <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
+                      <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
+                        :value="item.field"></el-option>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="6" style="padding: 0 10px;">
+                    <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange">
+                      <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+                        :value="item.value"></el-option>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="11">
+                    <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
+                      @keyup.enter.native="handleQuery" />
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </div>
+          </el-card>
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
+    <el-row :gutter="10" class="mb8" style="margin-top: 10px;">
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit(OperationType = 1)"
+          id="btn-Add">鏂板</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+          @click="handleEdit(row = rowForm, OperationType = 2)">缂栬緫</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
+          @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+          @click="set_CheckBill(1, form = rowForm)">瀹℃牳</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+          @click="set_CheckBill(2, form = rowForm)">杩斿鏍�</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
+          @click="set_CheckBillAll(1, ids)">瀹℃牳(鎵归噺)</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
+          @click="set_CheckBillAll(2, ids)">杩斿鏍�(鎵归噺)</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
+      </el-col> -->
+    </el-row>
+    <div class="tableBox" v-loading="loading">
+      <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
+        @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
+        @cell-dblclick="handleDblclick" v-if="tableShow">
+        <template v-for="(item, index) in btList">
+          <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
+            :key="index" />
+          <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width" :key="item.id"
+            v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort" show-overflow-tooltip
+            :fixed="item.fixed">
+            <template slot-scope="{row,  column }">
+              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+              <div :style="item.style">
+                <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+                <el-button type="text" @click="handleEdit(row, OperationType = 2)"
+                  v-else-if="column.property == '鍗曟嵁鍙�'">{{
+                    row.鍗曟嵁鍙�
+                  }}</el-button>
+                <span v-else>{{ row[column.label] }}</span>
+              </div>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes" @pagination="getList" />
+      <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+        <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose"
+          v-if="rowHideShow" />
+      </el-dialog>
+      <!-- 缂栬緫 -->
+      <el-dialog title="缂栬緫鍣ㄥ叿鍏ュ簱鐢宠鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+        <edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
+          :copyType="copyType" @editClose="editClose" v-if="editShow" />
+      </el-dialog>
+      <el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
+        <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName'
+          :HModName='HModName' @rowEditClose="rowSetClose" v-if="printListShow" />
+        <!-- <div>111</div> -->
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import RowSettings from '@/views/component/rowSettings'
+import Edit from '@/views/scMould/warehouse/Sc_MouldInRequestBillEdit'
+import PrintList from '@/views/component/printList'
+import moment from 'moment';
+
+export default {
+  name: 'Sc_MouldInRequestBillList',
+  components: { RowSettings, Edit, PrintList },
+  data() {
+    return {
+      HModName: "Sc_MouldInRequestBillList",
+      activeSeach: '',
+      editShow: false,
+      openEdit: false,
+      totalNameList: [],
+      tableShow: true,
+      openPrintList: false,
+      printListShow: false,
+      openBtnHide: false,
+      btnHideShow: false,
+      rowHideShow: false,
+      openRowHide: false,
+      copyType: 0,
+      comparatorList: [
+        { label: '=', value: '=' },
+        { label: '>=', value: '>=' },
+        { label: '>', value: '>' },
+        { label: '<=', value: '<=' },
+        { label: '<', value: '<' },
+        { label: '<>', value: '<>' },
+        { label: '鍖呭惈', value: '7' },
+        { label: '宸﹀寘鍚�', value: '8' },
+        { label: '鍙冲寘鍚�', value: '9' },
+        { label: '涓嶅寘鍚�', value: '10' },
+      ],
+      sWhere: '',
+      sTime: '',
+      eTime: '',
+      rqsgList: [
+        { label: '浠婂ぉ', value: 0 },
+        { label: '杩戜袱澶�', value: 1 },
+        { label: '杩戜笁澶�', value: 2 },
+        { label: '杩戝洓澶�', value: 3 },
+        { label: '杩戜簲澶�', value: 4 },
+        { label: '杩戝叚澶�', value: 5 },
+        { label: '杩戜竷澶�', value: 6 },
+        { label: '杩�30澶�', value: 29 },
+        { label: '杩戝崐骞�', value: 180 },
+        { label: '杩戜竴骞�', value: 365 },
+      ],
+      organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+      HStatusList: [{name:'鍏ㄩ儴',value:'-1'},{name:'鏈鏍�',value:'0'},{name:'宸插鏍�',value:'1'},{name:'宸插叧闂�',value:'2'}],
+      addBtnShow: false,
+      dialogTitle: '',
+      OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+      HInterID: null,
+      baseURL: process.env.VUE_APP_BASE_API,
+      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+      lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
+      selectedRow: null, // 褰撳墠閫変腑鐨勮
+      rowForm: {},
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        HStockOrgID: sessionStorage["OrganizationID"] - 0,
+        HStatus:'-1',
+        HDept:'',
+        HModelNumber:'',
+        HSupName:'',
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      },
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 閬僵灞�
+      loading: true,
+      tyResList: [],//鍒楄〃锛堟帴鍙f暟鎹級
+      btList: [],//琛ㄥご鍒楄〃鏄剧ず
+      btResList: [],
+      tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+      dataList: [],
+      titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+      pageSizes: [50, 100, 500, 5000, 50000],
+      page: 1,
+      pageSize: 0,
+      total: 0,
+    };
+  },
+  created() {
+    // this.fetchData()
+    this.riqiChange()
+    this.getList();
+  },
+
+  methods: {
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '鍚堣';
+          return;
+        }
+        const values = data.map(item => Number(item[column.property]));
+        if (this.totalNameList[index].totalRow) {
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0)
+
+          } else {
+            sums[index] = '';
+          }
+        }
+      }, 1000);
+      return sums;
+    },
+
+    handleBtnHide() {
+      this.btnHideShow = true
+      this.openBtnHide = true
+    },
+    handleRowHide() {
+      this.rowHideShow = true
+      this.openRowHide = true
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false
+      this.tableShow = true
+      this.openRowHide = val
+      this.getList()
+    },
+    riqiChange() {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
+      const yyyyS = start.getFullYear();
+      const mmS = String(start.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddS = String(start.getDate()).padStart(2, '0');
+      const yyyyE = end.getFullYear();
+      const mmE = String(end.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddE = String(end.getDate()).padStart(2, '0');
+      this.sTime = yyyyS + '-' + mmS + '-' + ddS
+      this.eTime = yyyyE + '-' + mmE + '-' + ddE
+    },
+    getList() {
+      this.pageSize = 50
+      this.tableShow = false
+      this.loading = true
+      if (this.sTime && !this.sWhere) {
+        this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+        this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+        this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
+        this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
+      }
+      this.sWhere += " and HSTOCKORGID=" + this.queryParams.HStockOrgID;
+      if (this.pageSize == 0) {
+        this.pageSize = 50
+      }
+      // 閿�鍞嚭搴撳崟鍒楄〃
+      axios.get(this.baseURL + '/Sc_MouldInRequestBillController/page', {
+        params: {
+          "sWhere": this.sWhere,
+          "user": sessionStorage["HUserName"],
+          "page": this.page,
+          "size": this.pageSize
+        },
+      }).then(response => {
+        this.tyResList = response.data.data//鎬绘暟鎹�
+        let data1 = response.data
+        let option = []
+        if (data1.code == 1) {
+          this.btResList = data1.list//閿�鍞嚭搴撳崟鎺ュ彛琛ㄥご鏁版嵁
+          this.total = data1.count;
+          var data = [];//鍒楀瓧娈垫暟鎹�
+          var col = [];
+          var totalArray = ["浠舵暟"];
+          //缁欑┖鐨勬暟缁勮祴鍊�
+          for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+            var patrn = new RegExp(/^h/i);
+            if (patrn.test(data1.list[key].ColmCols)) {
+                this.titleData[key] = data1.list[key].ColmCols;
+            }
+          }
+          //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+          col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+          for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+            if (this.titleData.indexOf(data[i].name) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁$畻鍒�
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+            } else if (totalArray.indexOf(data[i].name) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁$畻鍒�
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+            }
+            else {
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+            }
+
+          }
+          option.cols = [col]
+          option.data = data1.data
+          this.dataList = option
+          this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    DisPlay_HideColumn(HModName, user, option, dataOption) {
+      this.totalNameList = []
+      axios.get(this.baseURL + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
+        params: {
+          "HModName": HModName,
+          "user": user,
+        },
+      }).then(res => {        
+        let data1 = res.data
+        if (data1.data.length != 0) {       
+          var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+          var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+          newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+          dataCol = data1.data[0].HGridString.split(',');
+          //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+          if (dataCol.length == option.cols[0].length - 1) {                
+            //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+            for (var j = 0; j < option.cols[0].length - 1; j++) {
+              for (var i = 0; i < option.cols[0].length - 1; i++) {
+                var dataCols = dataCol[j].split('|');
+                //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                  //闅愯棌鍒�
+                  if (dataCols[1] == 1) {
+                    option.cols[0][i + 1]["hide"] = true;
+                  }
+                  //璁剧疆鍒楀
+                  if (dataCols[3] > 0) {
+                    option.cols[0][i + 1]["width"] = dataCols[3];
+                  }
+                  //璁剧疆鍐呭瀛椾綋澶у皬
+                  if (data1.data[0].HFontSize != 0) {
+                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                  } else {
+                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                  }
+                  //鏄剧ず鍒�
+                  if (dataCols[1] == 0 && this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1) {
+                    option.cols[0][i + 1]["hide"] = false;
+                  }
+                  //缁熻鍒�
+                  if (dataCols[6] == 1) {
+                    option.cols[0][i + 1]["totalRow"] = true;
+                  } else {
+                    option.cols[0][i + 1]["totalRow"] = false;
+                  }
+                  //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                  switch (dataCols[2]) {
+                    case "L":
+                      option.cols[0][i + 1]["align"] = "left";
+                      break;
+                    case "M":
+                      option.cols[0][i + 1]["align"] = "center";
+                      break;
+                    case "R":
+                      option.cols[0][i + 1]["align"] = "right";
+                      break;
+                  }
+                  //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                  if (dataCols[4] != null && dataCols[4] != "") {
+                    option.cols[0][i + 1]["title"] = dataCols[4];
+                  }
+                  newCols[0].push(option.cols[0][i + 1]);
+                  break;
+                }
+              }
+            }
+            //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+            if (dataCol.length == newCols[0].length - 1) {
+              option.cols = newCols;
+              //鍙栨秷鍐荤粨鍒�
+              for (var i = 1; i < option.cols[0].length - 1; i++) {
+                if (option.cols[0][i + 1]["fixed"] != null) {
+                  option.cols[0][i + 1]["fixed"] = null;
+                }
+                else {
+                  break;
+                }
+              }
+              //鍐荤粨鍒�
+              if (data1.data[0].HFixCols != 0) {
+                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                  if (dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1) {
+                    data1.data[0].HFixCols += 1;
+                  }
+
+                  option.cols[0][i + 1]["fixed"] = "left";
+                }
+              }
+              //璁剧疆鍒楁帓搴�
+              for (var i = 1; i < option.cols[0].length; i++) {
+                if (data1.data[0].HSortFlag == "鏄�") {
+                  option.cols[0][i]["sort"] = true;
+                }
+                else {
+                  option.cols[0][i]["sort"] = false;
+                }
+              }
+            }
+          }
+          this.btList = option.cols[0]
+          this.btList.map(item => {
+            if (!item.hide) {
+              this.totalNameList.push(item)
+            }
+          })
+          if (data1.data[0].HPageSize == 0) {
+            this.pageSize = 50
+          } else {
+            this.pageSize = data1.data[0].HPageSize
+          }
+          this.tableData = option.data
+          this.tableShow = true
+          this.loading = false
+        } else {
+          this.btList = dataOption.cols[0]
+          this.btList.map(item => {
+            if (!item.hide) {
+              this.totalNameList.push(item)
+            }
+          })
+          this.tableData = dataOption.data
+          this.tableShow = true
+          this.loading = false
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    renderHeader(h, { column, $index }) {// 鏂板缓涓�涓� span
+      let span = document.createElement(span)// 璁剧疆琛ㄥご鍚嶇О
+      span.innerText = column.label
+      //涓存椂鎻掑叆 document
+      document.body.appendChild(span)// 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
+      document.body.removeChild(span)
+      return h(span, column.label)
+    },
+    //鐐瑰嚮琛�
+    handleRowClick(row, column, event) {
+      this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆¢�変腑鐨勮
+      this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+      this.lastSelectedRowIndex = this.tableData.indexOf(row);
+      this.$refs.tableData.toggleRowSelection(row);
+    },
+    //閫変腑琛岄珮浜牱寮�
+    rowStyle({ row, rowIndex }) {
+      if (this.ids.includes(row.hmainid)) {
+        return { "background": "#ecf5ff" }
+      }
+    },
+    //鍙屽嚮琛�
+    handleDblclick(row, column, cell, event) {
+      this.OperationType = 2
+      this.handleEdit()
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      // this.rowForm = {}
+      this.ids = selection.map(item => item.hmainid)
+      this.single = selection.length != 1
+      this.multiple = !selection.length
+      if (!this.single) {
+        this.rowForm = selection[0]
+      }
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.sWhere = ''
+      if (this.queryParams.ColName && this.queryParams.Comparator) {
+        var com = "";
+        switch (this.queryParams.Comparator) {
+          case "7":
+            com = "like'%" + this.queryParams.ColContent + "%'";
+            break;
+          case "8":
+            com = "like'%" + this.queryParams.ColContent + "'";
+            break;
+          case "9":
+            com = "like'" + this.queryParams.ColContent + "%'";
+            break;
+          case "10":
+            com = "not like'%" + this.queryParams.ColContent + "%'";
+            break;
+          default:
+            com = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName + " " + com;
+      }
+      if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+        var com1 = "";
+        switch (this.queryParams.Comparator1) {
+          case "7":
+            com1 = "like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "8":
+            com1 = "like'%" + this.queryParams.ColContent1 + "'";
+            break;
+          case "9":
+            com1 = "like'" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "10":
+            com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          default:
+            com1 = "" + this.queryParams.Comparator1 + "'" + this.queryParams.ColContent1 + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+      }
+      if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+        var com2 = "";
+        switch (this.queryParams.Comparator2) {
+          case "7":
+            com2 = "like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "8":
+            com2 = "like'%" + this.queryParams.ColContent2 + "'";
+            break;
+          case "9":
+            com2 = "like'" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "10":
+            com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          default:
+            com2 = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+      }
+      if (this.sTime) {
+          this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+          this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
+      }
+      if (this.eTime) {
+          this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+          this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
+      }
+      if (this.queryParams.HBillNo) {
+        this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
+      }
+      if (this.queryParams.HDept) {
+          this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
+      }
+      if (this.queryParams.HModelNumber) {
+          this.sWhere += " and 妯″叿浠g爜 like '%" + this.queryParams.HModelNumber + "%'";
+      }
+      if (this.queryParams.HSupName) {
+          this.sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
+      }
+      this.getList()
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.sWhere = ''
+      this.queryParams = {
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        HStockOrgID: sessionStorage["OrganizationID"] - 0,
+        HStatus:'-1',
+        HDept:'',
+        HModelNumber:'',
+        HSupName:'',
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      }
+      this.riqiChange()
+      this.resetForm("queryForm")
+      this.getList()
+    },
+
+    //閫�鍑�
+    close() {
+      // this.reset()
+      this.tableShow = true
+      this.openEdit = false
+      this.editShow = false
+      this.getList()
+    },
+    //鎵撳紑鏂板缁勪欢寮圭獥
+    handleAddEdit() {
+      this.rowForm.hmainid = 0
+      this.editShow = true
+      this.openEdit = true
+    },
+    //鎵撳紑淇敼缁勪欢寮圭獥
+    handleEdit(row) {
+      this.rowForm = row
+      this.editShow = true
+      this.openEdit = true
+    },
+    //鍏抽棴缂栬緫椤甸潰
+    editClose(val) {
+      this.open = val
+      this.editShow = false
+      this.openEdit = val
+      this.getList()
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete() {
+      this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+        axios.get(this.baseURL + "/Sc_MouldInRequestBillController/GetSc_MouldInRequestBill_Delete_Json", {
+            params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
+          }).then(response => {
+            if (response.data.count == 1) {
+              this.getList()
+              this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+            } else {
+              this.$modal.msgError("閿欒:" + result.code + result.Message);
+            }
+          }).catch(error => {
+            this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+          });
+      }).catch(() => { })
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.hmainid || form.HInterID
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Sc_MouldInRequestBillController/GetSc_MouldInRequestBill_Check_Json", {
+        params: { "HInterID": InterID, "Type": num, "HMaker": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.count == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+          this.getList();
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    // 鎵归噺鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBillAll(num, ids) {
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Sc_MouldInRequestBillController/CheckAll", {
+        params: { "ids": ids, "Type": num, "HMaker": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.count == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+          this.getList();
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //瀵煎嚭
+    handleExport() {
+      const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
+      const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
+      this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
+      this.$XLSX.writeFile(wb, `sellOutBill_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢      
+    },
+    //鎵撳嵃
+    get_PrintReport() {
+      if (this.ids.length != 1) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
+        this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
+      } else {
+        axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
+          params: { "HInterID": this.rowForm.hmainid }
+        }).then(response => {
+          var result = response.data
+          if (result.count == 1) {
+            this.printListShow = true
+            this.openPrintList = true
+            // this.$router.push({ path:'/printList', query: { linterid: this.rowForm.hmainid,MyMsg:this.rowForm.hmainid,Type:'Kf_SellOutBillList' }})
+          } else {
+            this.$modal.msgError(result.code + result.Message)
+          }
+        }).catch(error => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+
+
+      }
+      //  var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
+    },
+
+    //#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
+    defaintOperationByCompanyName() {
+      var result = false;
+      axios.get(this.baseURL + '/Xt_getInfo/getCompanyName').then(response => {
+        var data1 = response.data
+        if (data1.count == 1) {
+          if (data1.data == "姘村姟") {
+            result = true;
+          }
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+      return result;
+    },
+  }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
index 1f9264a..b98806c 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -978,12 +978,18 @@
           })
           this.$nextTick(() => {
             if (!fhck) {
-              if(this.OperationType == 2){
-                this.form.HInterID = this.linterid
+              var Operation = null
+              if(!this.OperationType){
+                Operation = 1
+              }else{
+                Operation = this.OperationType
+                if(Operation == 2){
+                  this.form.HInterID = this.linterid
+                }
               }
               var sMainStr = JSON.stringify(this.form);
               var sSubStr = JSON.stringify(this.editData);
-              var sMainSub = sMainStr + ';' + sSubStr + ';' + this.OperationType + ";" + sessionStorage["HUserName"];
+              var sMainSub = sMainStr + ';' + sSubStr + ';' + Operation + ";" + sessionStorage["HUserName"];
               axios({
                 method: 'post',
                 url: this.baseURL + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Save_Json",
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
index de42970..57240f3 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
@@ -370,8 +370,10 @@
       this.tableShow = false
       this.loading = true
       if (this.sTime && !this.sWhere) {
-        this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'"
-        this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'"
+        this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+        this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+        this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
+        this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
       }
       this.sWhere += " and HSTOCKORGID=" + this.queryParams.HStockOutOrgID;
       if (this.pageSize == 0) {
@@ -658,26 +660,24 @@
         this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
       }
       if (this.sTime) {
-        this.sTime = moment(this.sTime).format('YYYY-MM-DD')
-        this.eTime = moment(this.eTime).format('YYYY-MM-DD')
-        console.log(this.sTime, this.eTime)
-        this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'" + " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
+          this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+          this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
       }
-      
+      if (this.eTime) {
+          this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+          this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
+      }
       if (this.queryParams.HBillNo) {
         this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
       }
       if (this.queryParams.HDept) {
-          sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
-      }
-      if (this.queryParams.HMaterNumber) {
-          sWhere += " and 鐗╂枡浠g爜 like '%" + this.queryParams.HMaterNumber + "%'";
+          this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
       }
       if (this.queryParams.HModelNumber) {
-          sWhere += " and 妯″叿浠g爜 like '%" + this.queryParams.HModelNumber + "%'";
+          this.sWhere += " and 妯″叿浠g爜 like '%" + this.queryParams.HModelNumber + "%'";
       }
       if (this.queryParams.HSupName) {
-          sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
+          this.sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
       }
       this.getList()
     },
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
new file mode 100644
index 0000000..000d1b8
--- /dev/null
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
@@ -0,0 +1,1125 @@
+<template>
+  <div v-loading="formLoading" v-if="formShow">
+    <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
+      <!-- <el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button> -->
+      <el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
+      <!-- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button> -->
+      <el-button type="primary" @click="close">閫� 鍑�</el-button>
+      <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
+    </div>
+    <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍣ㄥ叿棰嗙敤鐢宠鍗�</div>
+    <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+      <el-tabs v-model="activeName" type="card">
+        <el-tab-pane label="鍩烘湰淇℃伅" name="first">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+                <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鏃ユ湡" prop="HDate">
+                <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="缁勭粐" prop="HStockOrgID">
+                <el-select v-model="form.HStockOrgID" placeholder="璇烽�夋嫨缁勭粐">
+                  <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
+                <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+                  <el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+                <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨寰�鏉ュ崟浣�" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="閮ㄩ棬" prop="HDeptName">
+                <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1,deptType=1)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="浠撳簱" prop="HWHName">
+                <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨璋冨叆浠撳簱" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=1)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="涓氬姟鍛�" prop="HEmpName">
+                <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=1)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="涓荤" prop="HMangerName">
+                <el-input v-model="form.HMangerName" placeholder="璇烽�夋嫨" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=2)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="楠屾敹鍛�" prop="HSecManagerName">
+                <el-input v-model="form.HSecManagerName" placeholder="璇烽�夋嫨" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=3)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="淇濈鍛�" prop="HKeeperName">
+                <el-input v-model="form.HKeeperName" placeholder="璇烽�夋嫨" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=4)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="婧愬崟绫诲瀷" prop="HSourceBillType">
+                <el-select v-model="form.HSourceBillType" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+                  <el-option v-for="(item, index) in HSourceBillTypes" :key="index" :label="item.HSourceBillTypeName" :value="item.HSourceBillType">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="婧愬崟鍗曞彿" prop="HRemark">
+                <el-input placeholder="璇烽�夋嫨婧愬崟鍗曞彿" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="get_checkMainSource()"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="鎽樿" prop="HExplanation">
+                <el-input v-model="form.HExplanation" placeholder="璇疯緭鍏ユ憳瑕�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="澶囨敞" prop="HRemark">
+                <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="鍒跺崟淇℃伅" name="third">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鍒跺崟浜�" prop="HMaker">
+                <el-input v-model="form.HMaker" placeholder="璇疯緭鍏ュ埗鍗曚汉" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="淇敼浜�" prop="HUpDater">
+                <el-input v-model="form.HUpDater" placeholder="璇疯緭鍏ヤ慨鏀逛汉" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="瀹℃牳浜�" prop="HChecker">
+                <el-input v-model="form.HChecker" placeholder="璇疯緭鍏ュ鏍镐汉" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍏抽棴浜�" prop="HCloseMan">
+                <el-input v-model="form.HCloseMan" placeholder="璇疯緭鍏ュ叧闂汉" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鍒跺崟鏃ユ湡" prop="HMakeDate">
+                <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="淇敼鏃ユ湡" prop="HUpDateDate">
+                <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckDate">
+                <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍏抽棴鏃ユ湡" prop="HCloseDate">
+                <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="浣滃簾浜�" prop="HDeleteMan">
+                <el-input v-model="form.HDeleteMan" placeholder="璇疯緭鍏ヤ綔搴熶汉" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="浣滃簾鏃ユ湡" prop="HDeleteDate">
+                <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+      </el-tabs>
+
+      <el-tabs v-model="activeName1" type="border-card">
+        <el-tab-pane label="鏄庣粏淇℃伅" name="first">
+          <div style="margin-bottom: 10px;">
+            <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
+            <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
+              size="mini">鎻掑叆涓�琛�</el-button>
+            <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
+            <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
+              size="mini">涓婄Щ</el-button>
+            <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
+              size="mini">涓嬬Щ</el-button>
+          </div>
+          <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
+            @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column align="center" label="搴忓彿" type="index" width="80" />
+            <el-table-column align="center" label="鍣ㄥ叿浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HMaterNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(8, scope.row)"
+                  @dblclick.native="openDataDialog(8, scope.row)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="鍣ㄥ叿鍚嶇О" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HMaterName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HMaterModel }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璁¢噺鍗曚綅浠g爜" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HUnitNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璁¢噺鍗曚綅鍚嶇О" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HUnitName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="鏁伴噺" width="120">
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.HQty" :min="1" style="width: 90px;"
+                  controls-position="right"></el-input-number>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="浠撳簱浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HWHNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=2)"
+                  @dblclick.native="openDataDialog(2, scope.row ,eHWHType=2)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="浠撳簱鍚嶇О" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HWHName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="婧愬崟鍗曞彿" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HSourceBillNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="澶囨敞" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
+              <template slot-scope="scope">
+                <el-button type="danger" icon="el-icon-delete" size="mini" circle
+                  @click="handleDeleteSysZb(scope.row)"></el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+      
+    </el-form>
+    <!-- 寮圭獥 -->
+    <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+      <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="deptShow" />
+      <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
+      <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+      <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+      <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
+      <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
+      <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
+      <ScICMOBillList @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="ScICMOBillShow" />
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+        <el-button @click="deptClose">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+      <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import RowSettings from '@/views/component/rowSettings'
+import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import Dept from '@/views/basic/gy/gyDepartment'
+import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
+import GyCustomer from '@/views/GyCustomer'
+import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
+import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+import ScICMOBillList from '@/views/ICMO/ScICMOBillList.vue'
+import moment from 'moment';
+
+export default {
+  name: 'Sc_MouldOutRequestBillEdit',
+  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ScICMOBillList },
+  props: {
+    OperationType: { type: Number, },
+    linterid: { type: Number, },
+    HSouceBillType: { type: String, },
+    propsData: { type: String, },
+    copyType: { type: Number, },
+  },
+  data() {
+    return {
+      HModName: "Sc_MouldOutRequestBill",
+      formShow: false,
+      temp: undefined,
+      formLoading: true,
+      rowHideShow: false,
+      openRowHide: false,
+      hSupTypeList: [{name:'渚涘簲鍟�',id:1,},{name:'瀹㈡埛',id:2},{name:'杞﹂棿閮ㄩ棬',id:3}],
+      HSourceBillTypes:[],
+      addBtnShow: false,
+      zbIndex: null,
+      zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
+      dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+      deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
+      warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
+      gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+      gySupplierShow: false,//渚涘簲鍟嗘暟鎹粍浠�
+      gyCustomerShow: false,//瀹㈡埛鏁版嵁缁勪欢
+      gyMouldShow: false,//鍣ㄥ叿鏁版嵁缁勪欢
+      gyStockPlaceShow: false,//浠撲綅鏁版嵁缁勪欢
+      ScICMOBillShow: false,//鐢熶骇鏁版嵁缁勪欢
+      eHWHType:1,//浠撳簱寮圭獥鍖哄垎鏍囧織
+      empType:1,//鑱屽憳寮圭獥鍖哄垎鏍囧織
+      HSPType:1,//浠撲綅寮圭獥鍖哄垎鏍囧織
+      deptType:1,//閮ㄩ棬寮圭獥鍖哄垎鏍囧織
+      deptform: {},//寮圭獥閫変腑鏁版嵁
+      openData: false,//鏁版嵁寮圭獥
+      dialogTitle: '',
+      organizationList: [],//缁勭粐鍒楄〃
+      subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+      // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+      HInterID: 0,
+      baseURL: process.env.VUE_APP_BASE_API,
+      checkedSysZb: [],
+      editData: [],//瀛愯〃
+      editData1: [],//姹囨�诲瓙琛�
+      editBtData: [],//瀛愯〃琛ㄥご
+      activeName: 'first',
+      activeName1:'first',
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏃ユ湡鑼冨洿
+      dateRange: [],
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        HProjectNumber: '',
+        HCusID: null,
+        HMaterNumber: '',
+        HMaterName: '',
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      },
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 閬僵灞�
+      loading: true,
+      btResList: [],
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        HBillNo: [
+          { required: true, message: "鍗曟嵁鍙蜂笉鑳戒负绌�", trigger: "blur" }
+        ],
+        HDate: [
+          { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        HStockOrgID: [
+          { required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.fetchData()
+    this.SourceBillType()
+    this.getdata()
+  },
+  methods: {
+    fetchData() {
+      axios.get(this.baseURL + "/Web/GetOrganizations", {
+      }).then(response => {
+        if (response.data.count == 1) {
+          this.organizationList = response.data.data;//缁勭粐鍒楄〃
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    SourceBillType(){
+      axios.get(this.baseURL + "/Web/GetHSourceBillType", {
+        params: { "HName": '鍣ㄥ叿棰嗙敤鐢宠鍗�', "Num": 2 }//0钃濆崟 1绾㈠崟 2涓嶅垎绾㈣摑鍗�
+      }).then(response => {
+        if (response.data.count == 1) {
+          this.HSourceBillTypes = response.data.data
+          this.form.HSourceBillType = this.HSourceBillTypes[0].HSourceBillType
+          this.form.HSourceBillTypeName = this.HSourceBillTypes[0].HSourceBillTypeName
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    getdata() {
+      console.log(this.copyType, this.OperationType)
+      this.formShow = false
+      this.formLoading = true
+      if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
+        this.handleAdd()
+      } else if (this.OperationType == 2 || this.copyType == 1) {
+        this.handleUpdate()
+      }
+    },
+    // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+    getUrlVars_JSON() {
+      var datajson;
+      var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+      var arr = str.substring(str.lastIndexOf("=") + 1);
+      datajson = JSON.parse(decodeURI(arr));
+      return datajson;
+    },
+    handleRowHide() {
+      this.rowHideShow = true
+      this.openRowHide = true
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false
+      this.openRowHide = val
+    },
+    //寮圭獥璧嬪��
+    dbEmitData(deptRow, num) {
+      // num=1閮ㄩ棬 num=2浠撳簱
+      console.log(deptRow)
+      if(num == 10){
+        if (deptRow.length > 0) {
+          var rowdata = [];
+          for (let i = 0; i < deptRow.length; i++) {
+              rowdata.push(
+                  {
+                      "HMaterID": "0"
+                      , "HMaterNumber": ""
+                      , "HMaterName": ""
+                      , "HMaterModel": ""
+                      , "HUnitID": "0"
+                      , "HUnitNumber": ""
+                      , "HUnitName": ""
+                      , "HQty": "0"
+                      , "HWHID": "0"
+                      , "HWHNumber": ""
+                      , "HWHName": ""
+                      , "HSPID": "0"
+                      , "HSPNumber": ""
+                      , "HSPName": ""
+                      , "HSourceInterID": deptRow[i].hmainid == null ? 0 : deptRow[i].hmainid
+                      , "HSourceEntryID": deptRow[i].hsubid == null ? 0 : deptRow[i].hsubid
+                      , "HSourceBillType": deptRow[i].鍗曟嵁绫诲瀷 == null ? "" : deptRow[i].鍗曟嵁绫诲瀷
+                      , "HSourceBillNo": deptRow[i].鍗曟嵁鍙� == null ? "" : deptRow[i].鍗曟嵁鍙�
+                      , "HRelationQty": "0"
+                      , "HRelationMoney": "0"
+                      , "HRemark": ""
+                      , "HPropertyID": "0"
+                      , "HSecUnitID": "0"
+                      , "HSecUnitRate": "0"
+                      , "HQtyMust": "0"
+                      , "HPrice": "0"
+                      , "HMoney": "0"
+                      , "HERPInterID": "0"
+                      , "HERPEntryID": "0"
+                      , "HPOOrderInterID": "0"
+                      , "HPOOrderEntryID": "0"
+                      , "HPOOrderBillNo": ""
+                      , "HSeOrderInterID": "0"
+                      , "HSeOrderEntryID": "0"
+                      , "HSeOrderBillNo": ""
+                      , "HICMOInterID": deptRow[i].hmainid == null ? 0 : deptRow[i].hmainid
+                      , "HICMOEntryID": deptRow[i].hsubid == null ? 0 : deptRow[i].hsubid
+                      , "HICMOBillNo": deptRow[i].鍗曟嵁鍙� == null ? "" : deptRow[i].鍗曟嵁鍙�
+                      , "HSTOCKORGID": this.form.HStockOrgID
+                      , "HOWNERID": this.form.HStockOrgID
+                      , "HOWNERTYPEID": ""
+                      , "HSEQ": "0"
+                      , "HSTOCKSTATUSID": "0"
+                  }
+              )
+          }
+          this.editData = rowdata
+          this.ScICMOBillShow = false
+          this.openData = false
+        } else {
+          this.$modal.msgError("璇烽�夋嫨鏁版嵁!");
+        }
+      }else{
+        if (deptRow.HItemID || deptRow.hmainid) {
+          if (num == 1) {
+            if(this.deptType == 1){
+              this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+              this.form.HDeptID = deptRow.HItemID
+            }else{
+              this.form.HSupName = deptRow.閮ㄩ棬鍚嶇О
+              this.form.HSupID = deptRow.HItemID
+            }
+            this.deptShow = false
+            this.openData = false
+          } else if (num == 2) {
+            if(this.eHWHType == 1){
+              this.form.HWHName = deptRow.浠撳簱鍚嶇О
+              this.form.HWHID = deptRow.HItemID
+              this.form.HWHNumber = deptRow.浠撳簱浠g爜
+            }else if(this.eHWHType == 2){
+              this.editData[this.zbIndex].HWHID = deptRow.HItemID
+              this.editData[this.zbIndex].HWHNumber = deptRow.浠撳簱浠g爜
+              this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
+            }
+            this.warehouseShow = false
+            this.openData = false
+          } else if (num == 4) {
+            if(this.empType == 1){
+              this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
+              this.form.HEmpID = deptRow.HItemID
+            }else if(this.empType == 2){
+              this.form.HMangerName = deptRow.鑱屽憳鍚嶇О
+              this.form.HMangerID = deptRow.HItemID
+            }else if(this.empType == 3){
+              this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
+              this.form.HSecManagerID = deptRow.HItemID
+            }else if(this.empType == 4){
+              this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
+              this.form.HKeeperID = deptRow.HItemID
+            }else
+            this.gyEmployeeShow = false
+            this.openData = false
+          } else if (num == 6) {
+            this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
+            this.form.HSupID = deptRow.HItemID
+            this.gySupplierShow = false
+            this.openData = false
+          } else if (num == 7) {
+            this.form.HSupName = deptRow.瀹㈡埛鍚嶇О
+            this.form.HSupID = deptRow.HItemID
+            this.gyCustomerShow = false
+            this.openData = false
+          } else if (num == 8){
+            this.editData[this.zbIndex].HMaterID = deptRow.hmainid
+            this.editData[this.zbIndex].HMaterNumber = deptRow.妯″叿缂栧彿
+            this.editData[this.zbIndex].HMaterName = deptRow.妯″叿鍚嶇О
+            this.editData[this.zbIndex].HMaterModel = deptRow.妯″叿鍨嬪彿
+            this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
+            this.editData[this.zbIndex].HUnitNumber = deptRow.璁¢噺鍗曚綅浠g爜
+            this.editData[this.zbIndex].HUnitName = deptRow.璁¢噺鍗曚綅
+            this.gyMouldShow = false
+            this.openData = false
+          } else if (num == 9){
+            if(this.HSPType == 1){
+              this.editData[this.zbIndex].HSPID = deptRow.HMainID
+              this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠g爜
+              this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
+            }else{
+              this.editData[this.zbIndex].HSCSPID = deptRow.HMainID
+              this.editData[this.zbIndex].HSCSPCode = deptRow.浠撲綅浠g爜
+              this.editData[this.zbIndex].HSCSPName = deptRow.浠撲綅鍚嶇О
+            }
+            this.gyStockPlaceShow = false
+            this.openData = false
+          }
+        } else {
+          this.$modal.msgError("璇烽�夋嫨鍗曟潯鏁版嵁!");
+        }
+      }
+    },
+    emitData(deptRow, num) {
+      this.dialogTypeNum = num
+      this.deptform = deptRow
+    },
+    deptClickSub() {
+      this.dbEmitData(this.deptform, this.dialogTypeNum)
+      this.deptform = {}
+    },
+    deptClose() {
+      this.deptform = {}
+      this.openData = false
+    },
+
+    //琛ㄥ崟鍒濆鍖�
+    reset() {
+      this.form = {
+        HBillNo: '',
+        HInterID: 0,
+        HDate: new Date(),
+        HStockOrgID:sessionStorage["OrganizationID"] - 0,
+        HSupTypeID:1,
+        HSupName:'',
+        HSupID:0,
+        HDeptName: '',
+        HDeptID: 0,
+        HWHName:'',
+        HWHNumber:'',
+        HWHID:0,
+        HEmpName:'',
+        HEmpID:'',
+        HMangerName:'',
+        HMangerID:'',
+        HSecManagerName:'',
+        HSecManagerID:'',
+        HKeeperName:'',
+        HKeeperID:'',
+        HExplanation:'',
+        HRemark:'',
+
+        HMaker: '',
+        HUpDater: '',
+        HChecker: '',
+        HMakeDate: new Date(),
+        HUpDateDate: '',
+        HCheckDate: '',
+        HCloseMan: '',
+        HDeleteMan: '',
+        HCloseDate: '',
+        HDeleteDate: '',
+      }
+      this.editData = []
+      this.editData1 = []
+      this.editBtData = []
+      this.ids = []
+      this.subDisabled = false
+      this.addBtnShow = false
+      // this.$refs.tableData.clearSelection()
+      this.activeName = 'first'
+      this.activeName1 = 'first'
+      this.resetForm("form");
+    },
+    //閫�鍑�
+    close() {
+      this.reset()
+      console.log(this.$route.path)
+      if (!this.OperationType && !this.copyType) {
+        console.log(this.$route.path)
+        const obj = { fullPath: this.$route.path, path: this.$route.path, name: this.$route.name, };
+        this.$tab.closePage(obj).then(res => {
+          const latestView = res.visitedViews.slice(-1)[0]
+          if (latestView) {
+            this.$router.push(latestView.fullPath)
+          } else {
+            if (obj.name === 'Dashboard') {
+              this.$router.replace({ path: '/redirect' + obj.fullPath })
+            } else {
+              this.$router.push('/')
+            }
+          }
+        });
+      } else {
+        this.formShow = false
+        this.$emit('editClose', false)
+      }
+    },
+    //鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
+    getCzyglByUser() {
+      axios.get(this.baseURL + '/Xs_SeOrderBill/getCzyglByUser', {
+        params: { "CurUserName": sessionStorage["HUserName"] }
+      }).then(response => {
+        let dataForm = response.data.data[0]
+        this.form.HDeptID = dataForm.HDeptID
+        this.form.HDeptName = dataForm.HDeptName
+        this.form.HEmpID = dataForm.HEmpID
+        this.form.HEmpName = dataForm.HEmpName
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset()
+      //鏂板鑾峰彇鍗曟嵁鍙�
+      this.getHBillNo()
+      let date = new Date()
+      this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+      if (this.OperationType == 1) {
+        this.handleAddSysZb()
+      }
+      this.$nextTick(() => {
+        this.formShow = true
+        this.formLoading = false
+      })
+    },
+    getHBillNo() {
+      axios.get(this.baseURL + "/WEBSController/GetMaxBillNo_Json", {
+        params: {
+          HBillType: '3849'
+        }
+      }).then(response => {
+        this.form.HMaker = sessionStorage["HUserName"]
+        this.form.HBillNo = response.data.data[0].HBillNo
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate() {
+      this.reset()
+      let rowHmainid = this.linterid
+      console.log(this.linterid)
+      //涓昏〃
+      axios.get(this.baseURL + "/Sc_MouldOutRequestBillController/GetSc_MouldOutRequestBill_Json", {
+        params: { 'HInterID': rowHmainid,'HMaker':sessionStorage["HUserName"] }
+      }).then(response => {
+        if (response.data.count == 1) {
+          var result = response.data
+          var data = response.data.data[0]
+          console.log(result,data)
+          if (this.copyType == 1) {
+            this.getHBillNo()
+            let date = new Date()
+            this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+          } else {
+            this.form = {
+                  "HBillNo": data.鍗曟嵁鍙�
+                , "HDate": data.鏃ユ湡
+                , "HSupTypeID": data.HSupTypeID
+                , "HSupID": data.HSupID
+                , "HSupName": data.寰�鏉ュ崟浣�
+                , "HDeptID": data.HDeptID
+                , "HDeptName": data.閮ㄩ棬
+                , "HWHID": data.HWHID
+                , "HWHName": data.浠撳簱
+                , "HEmpID": data.HEmpID
+                , "HEmpName": data.涓氬姟鍛�
+                , "HMangerID": data.HMangerID
+                , "HMangerName": data.涓荤
+                , "HSecManagerID": data.HSecManagerID
+                , "HSecManagerName": data.楠屾敹鍛�
+                , "HKeeperID": data.HKeeperID
+                , "HKeeperName": data.淇濈鍛�
+                , "HExplanation": data.鎽樿
+                , "HRemark": data.琛ㄥご澶囨敞
+                , "HStockOrgID": data.HStockOrgID
+                
+                , "HMaker": data.鍒跺崟浜�
+                , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
+                , "HChecker": data.瀹℃牳浜�
+                , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : data.瀹℃牳鏃ユ湡
+                , "HUpDater": data.淇敼浜�
+                , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : data.淇敼鏃ユ湡
+                , "HCloseMan": data.鍏抽棴浜�
+                , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : data.鍏抽棴鏃ユ湡
+                , "HDeleteMan": data.浣滃簾浜�
+                , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : data.浣滃簾鏃ユ湡
+            }
+            this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID;
+
+            //瀛愯〃
+            var rowdata = [];
+            for (let i = 0; i < result.data.length; i++) {
+              rowdata.push(
+                  {
+                    "HMaterID": result.data[i].HMaterID
+                    , "HMaterNumber": result.data[i].HMaterNumber
+                    , "HMaterName": result.data[i].HMaterName
+                    , "HMaterModel": result.data[i].HMaterModel
+                    , "HPropertyID": result.data[i].HProcID
+                    , "HSecUnitID": result.data[i].HSecUnitID
+                    , "HSecUnitRate": result.data[i].HSecUnitRate
+                    , "HUnitID": result.data[i].HUnitID
+                    , "HUnitNumber": result.data[i].HUnitNumber
+                    , "HUnitName": result.data[i].HUnitName
+                    , "HQtyMust": result.data[i].HQtyMust
+                    , "HQty": result.data[i].HQty
+                    , "HPrice": result.data[i].HPrice
+                    , "HMoney": result.data[i].HMoney
+                    , "HWHID": result.data[i].HWHID
+                    , "HWHNumber": result.data[i].HWHNumber
+                    , "HWHName": result.data[i].HWHName
+                    , "HSPID": result.data[i].HSPID
+                    , "HSPNumber": result.data[i].HSPNumber
+                    , "HSPName": result.data[i].HSPName
+                    , "HERPInterID": result.data[i].HERPInterID
+                    , "HERPEntryID": result.data[i].HERPEntryID
+                    , "HPOOrderInterID": result.data[i].HPOOrderInterID
+                    , "HPOOrderEntryID": result.data[i].HPOOrderEntryID
+                    , "HPOOrderBillNo": result.data[i].HPOOrderBillNo
+                    , "HSeOrderInterID": result.data[i].HSeOrderInterID
+                    , "HSeOrderEntryID": result.data[i].HSeOrderEntryID
+                    , "HSeOrderBillNo": result.data[i].HSeOrderBillNo
+                    , "HICMOInterID": result.data[i].HICMOInterID
+                    , "HICMOEntryID": result.data[i].HICMOEntryID
+                    , "HICMOBillNo": result.data[i].HICMOBillNo
+                    , "HSTOCKORGID": result.data[i].HSubSTOCKORGID
+                    , "HOWNERID": result.data[i].HOWNERID
+                    , "HOWNERTYPEID": result.data[i].HOWNERTYPEID
+                    , "HSEQ": result.data[i].HSEQ
+                    , "HSTOCKSTATUSID": result.data[i].HSTOCKSTATUSID
+                    , "HSourceBillType": result.data[i].HSourceBillType
+                    , "HSourceInterID": result.data[i].HSourceInterID
+                    , "HSourceEntryID": result.data[i].HSourceEntryID
+                    , "HSourceBillNo": result.data[i].HSourceBillNo
+                    , "HRelationQty": result.data[i].HRelationQty
+                    , "HRelationMoney": result.data[i].HRelationMoney
+                    , "HRemark": result.data[i].HRemark
+                  }
+              )
+            }
+            this.editData = rowdata
+          }
+          this.formShow = true
+          this.formLoading = false
+        }
+      }).catch(error => {
+        console.log(error)
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    /** 瀛愯〃鏄庣粏搴忓彿 */
+    rowSysZbIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** 缂栬緫椤靛瓙琛ㄦ坊鍔犳寜閽搷浣� */
+    handleAddSysZb(index, num) {
+      if (num == 1 && !index) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
+      } else {
+        let obj = {
+          "HMaterID": "0"
+          , "HMaterNumber": ""
+          , "HMaterName": ""
+          , "HMaterModel": ""
+          , "HUnitID": "0"
+          , "HUnitNumber": ""
+          , "HUnitName": ""
+          , "HQty": "0"
+          , "HWHID": "0"
+          , "HWHNumber": ""
+          , "HWHName": ""
+          , "HSPID": "0"
+          , "HSPNumber": ""
+          , "HSPName": ""
+          , "HSourceInterID": "0"
+          , "HSourceEntryID": "0"
+          , "HSourceBillType": ""
+          , "HSourceBillNo": ""
+          , "HRelationQty": "0"
+          , "HRelationMoney": "0"
+          , "HRemark": ""
+          , "HPropertyID": "0"
+          , "HSecUnitID": "0"
+          , "HSecUnitRate": "0"
+          , "HQtyMust": "0"
+          , "HPrice": "0"
+          , "HMoney": "0"
+          , "HERPInterID": "0"
+          , "HERPEntryID": "0"
+          , "HPOOrderInterID": "0"
+          , "HPOOrderEntryID": "0"
+          , "HPOOrderBillNo": ""
+          , "HSeOrderInterID": "0"
+          , "HSeOrderEntryID": "0"
+          , "HSeOrderBillNo": ""
+          , "HICMOInterID": "0"
+          , "HICMOEntryID": "0"
+          , "HICMOBillNo": ""
+          , "HSTOCKORGID": this.form.HStockOrgID
+          , "HOWNERID": this.form.HStockOrgID
+          , "HOWNERTYPEID": ""
+          , "HSEQ": "0"
+          , "HSTOCKSTATUSID": "0"
+        }
+        if (index) {
+          this.editData.splice(index, 0, obj);
+          this.$set(this.editData, index, obj)
+        } else {
+          this.editData.push(obj);
+        }
+      }
+    },
+    handleCopyZbRow() {
+      if (!this.zbIndex) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else {
+        let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+        this.editData.push(copyRow);
+      }
+    },
+    handleMoveRowUp(zbSelForm) {
+      if (!this.zbIndex) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else {
+        if (zbSelForm.index == 1) {
+          this.$modal.msgError("绗竴琛屾暟鎹棤娉曚笂绉�");
+        } else { // 纭繚涓嶆槸绗竴琛�
+          let num = zbSelForm.index - 1
+          const record = this.editData.splice(num, 1)[0];
+          this.editData.splice(num - 1, 0, record);
+        }
+      }
+    },
+    handleMoveRowDown(zbSelForm) {
+      if (!this.zbIndex) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else {
+        if (zbSelForm.index == this.editData.length) {
+          this.$modal.msgError("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉�");
+        } else { // 纭繚涓嶆槸绗竴琛�
+          let num = zbSelForm.index - 1
+          const record = this.editData.splice(num, 1)[0];
+          this.editData.splice(num + 1, 0, record);
+        }
+      }
+    },
+    /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
+    handleDeleteSysZb(row) {
+      this.checkedSysZb = []
+      this.checkedSysZb.push(row.index)
+      if (this.checkedSysZb.length == 0) {
+        this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑鍟嗗搧璁㈠崟鏄庣粏鏁版嵁");
+      } else {
+        const editData = this.editData;
+        const checkedSysZb = this.checkedSysZb;
+        this.editData = editData.filter(function (item) {
+          return checkedSysZb.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
+    handleTableZbEdit(selection) {
+      this.checkedSysZb = selection.map(item => item.index)
+      this.zbSelForm = selection[0]
+      this.zbIndex = this.checkedSysZb[0]
+      if (selection.length > 1) {
+        const del_row = selection.shift()
+        this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+      }
+    },
+    // 缂栬緫鎻愪氦淇濆瓨
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let fhck = false
+          if(this.editData.length == 0){
+              fhck = true
+              this.$modal.msgError("娌℃湁鐗╂枡鏄庣粏璁板綍锛�");
+          }
+          this.editData.map((item, index) => {
+            if (!item.HMaterID) {
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
+            }else if(!item.HQty || item.HQty == 0){
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+            }
+          })
+          this.$nextTick(() => {
+            if (!fhck) {
+              var Operation = null
+              if(!this.OperationType){
+                Operation = 1
+              }else{
+                Operation = this.OperationType
+                if(Operation == 2){
+                  this.form.HInterID = this.linterid
+                }
+              }
+              var sMainStr = JSON.stringify(this.form);
+              var sSubStr = JSON.stringify(this.editData);
+              var sMainSub = sMainStr + ';' + sSubStr + ';' + Operation + ";" + sessionStorage["HUserName"];
+              axios({
+                method: 'post',
+                url: this.baseURL + "/Sc_MouldOutRequestBillController/GetSc_MouldOutRequestBill_Save_Json",
+                data: {
+                  'sMainSub': sMainSub
+                },
+              }).then(response => {
+                if (response.data.count == 1) {
+                  this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+                  this.$modal.msgSuccess(response.data.Message);
+                  // if (response.data.Verify == "Y") //鑷姩瀹℃牳
+                  // {
+                  //   this.set_CheckBill(1, this.form); //瀹℃牳
+                  // }
+                  this.addBtnShow = true
+                  this.close()
+                } else {
+                  this.$modal.msgError(response.data.code + response.data.Message);
+                }
+              }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+              });
+            }
+          })
+        }
+      });
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.hmainid || form.HInterID
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Sc_MouldProdMoveBill/AuditMouldProdMoveBill", {
+        params: { "HInterID": InterID, "flag": num, "user": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.code == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    showReset() {
+      this.deptShow = false
+      this.warehouseShow = false
+      this.gyEmployeeShow = false
+      this.gySupplierShow = false
+      this.gyCustomerShow = false
+      this.gyMouldShow = false
+      this.gyStockPlaceShow = false
+      this.ScICMOBillShow = false
+    },
+    //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
+    openDataDialog(num, row) {
+      //num1閮ㄩ棬锛�2鍑哄簱浠撳簱锛�3鐗╂枡锛�4閿�鍞憳
+      if (row) {
+        this.zbIndex = row.index - 1
+      }
+      this.showReset()
+      if (num == 1) {
+        this.dialogTitle = '閮ㄩ棬鍒楄〃'
+        this.deptShow = true
+        this.openData = true
+      } else if (num == 2) {
+        this.dialogTitle = '浠撳簱鍒楄〃'
+        this.warehouseShow = true
+        this.openData = true
+      } else if (num == 4) {
+        if(this.empType == 1){
+          this.dialogTitle = '涓氬姟鍛樺垪琛�'
+        }else if(this.empType == 2){
+          this.dialogTitle = '涓荤鍒楄〃'
+        }else if(this.empType == 3){
+          this.dialogTitle = '楠屾敹鍛樺垪琛�'
+        }else if(this.empType == 4){
+          this.dialogTitle = '淇濈鍛樺垪琛�'
+        }
+        this.gyEmployeeShow = true
+        this.openData = true
+      } else if (num == 6) {
+        this.dialogTitle = '渚涘簲鍟嗗垪琛�'
+        this.gySupplierShow = true
+        this.openData = true
+      }  else if (num == 7) {
+        this.dialogTitle = '瀹㈡埛鍒楄〃'
+        this.gyCustomerShow = true
+        this.openData = true
+      }  else if (num == 8) {
+        this.dialogTitle = '鍣ㄥ叿鍒楄〃'
+        this.gyMouldShow = true
+        this.openData = true
+      }  else if (num == 9) {
+        this.dialogTitle = '浠撲綅鍒楄〃'
+        this.gyStockPlaceShow = true
+        this.openData = true
+      } else if (num == 10) {
+        this.dialogTitle = '鐢熶骇璁㈠崟鍒楄〃'
+        this.ScICMOBillShow = true
+        this.openData = true
+      } 
+    },
+    //鏍规嵁寰�鏉ョ被鍨嬪垽鏂線鏉ュ崟浣�
+    openDataDialogChoose(){
+      if(this.form.HSupTypeID == 1){
+        this.openDataDialog(6)
+      }else if(this.form.HSupTypeID == 2){
+        this.openDataDialog(7)
+      }else if(this.form.HSupTypeID == 3){
+        this.deptType = 2
+        this.openDataDialog(1)
+      }
+    },
+    //閫夋嫨婧愬崟
+    get_checkMainSource(){
+      if(this.form.HSourceBillType == "3710"){
+        this.openDataDialog(10)
+      }else{
+        this.$modal.msgError("鏈煡璇㈠埌鎵�閫夋簮鍗曠被鍨嬬浉鍏冲崟鎹俊鎭�!");
+      }
+    },
+  }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
new file mode 100644
index 0000000..a326bae
--- /dev/null
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
@@ -0,0 +1,855 @@
+<template>
+  <div style="padding: 10px;">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
+      <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px;">
+        <el-date-picker v-model="sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="缁撴潫鏃ユ湡">
+        <el-date-picker v-model="eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="鏃ユ湡闂撮殧">
+        <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange" style="width: 150px;">
+          <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+        <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label-width="78px">
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"> 鎼� 绱�</el-button>
+        <el-button icon="el-icon-circle-close" @click="resetQuery">閲� 缃�</el-button>
+      </el-form-item>
+      <el-collapse v-model="activeSeach">
+        <el-collapse-item title="鏇村" name="1">
+          <el-card class="box-card">
+            <el-form-item label="鐘舵��" prop="HStatus">
+              <el-select v-model="queryParams.HStatus" placeholder="璇烽�夋嫨鐘舵��">
+                <el-option v-for="(item, index) in HStatusList" :key="index" :label="item.name" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="缁勭粐">
+              <el-select v-model="queryParams.HStockOrgID" placeholder="璇烽�夋嫨">
+                <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="閮ㄩ棬淇℃伅" prop="HDept">
+              <el-input v-model="queryParams.HDept" placeholder="璇疯緭鍏ラ儴闂ㄤ俊鎭�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="鍣ㄥ叿浠g爜" prop="HModelNumber">
+              <el-input v-model="queryParams.HModelNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+              <el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <div slot="header" class="clearfix"><span>杩囨护</span></div>
+            <div>
+              <el-row>
+                <el-form-item label-width="0">
+                  <el-row>
+                    <el-col :span="7">
+                      <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <span v-for="(item, index) in btList" :key="index">
+                          <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+                        </span>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="6" style="padding: 0 10px;">
+                      <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+                          :value="item.value"></el-option>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="11">
+                      <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
+                        @keyup.enter.native="handleQuery" />
+                    </el-col>
+                  </el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
+                  <el-row>
+                    <el-col :span="7">
+                      <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <span v-for="(item, index) in btList" :key="index">
+                          <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+                        </span>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="6" style="padding: 0 10px;">
+                      <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+                          :value="item.value"></el-option>
+                      </el-select>
+                    </el-col>
+                    <el-col :span="11">
+                      <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
+                        @keyup.enter.native="handleQuery" />
+                    </el-col>
+                  </el-row>
+                </el-form-item>
+              </el-row>
+              <el-form-item label-width="0">
+                <el-row>
+                  <el-col :span="7">
+                    <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
+                      <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
+                        :value="item.field"></el-option>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="6" style="padding: 0 10px;">
+                    <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange">
+                      <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+                        :value="item.value"></el-option>
+                    </el-select>
+                  </el-col>
+                  <el-col :span="11">
+                    <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
+                      @keyup.enter.native="handleQuery" />
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </div>
+          </el-card>
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
+    <el-row :gutter="10" class="mb8" style="margin-top: 10px;">
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit(OperationType = 1)"
+          id="btn-Add">鏂板</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+          @click="handleEdit(row = rowForm, OperationType = 2)">缂栬緫</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
+          @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+          @click="set_CheckBill(1, form = rowForm)">瀹℃牳</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+          @click="set_CheckBill(2, form = rowForm)">杩斿鏍�</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
+          @click="set_CheckBillAll(1, ids)">瀹℃牳(鎵归噺)</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
+          @click="set_CheckBillAll(2, ids)">杩斿鏍�(鎵归噺)</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
+      </el-col> -->
+    </el-row>
+    <div class="tableBox" v-loading="loading">
+      <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
+        @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
+        @cell-dblclick="handleDblclick" v-if="tableShow">
+        <template v-for="(item, index) in btList">
+          <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
+            :key="index" />
+          <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width" :key="item.id"
+            v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort" show-overflow-tooltip
+            :fixed="item.fixed">
+            <template slot-scope="{row,  column }">
+              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+              <div :style="item.style">
+                <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+                <el-button type="text" @click="handleEdit(row, OperationType = 2)"
+                  v-else-if="column.property == '鍗曟嵁鍙�'">{{
+                    row.鍗曟嵁鍙�
+                  }}</el-button>
+                <span v-else>{{ row[column.label] }}</span>
+              </div>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes" @pagination="getList" />
+      <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+        <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose"
+          v-if="rowHideShow" />
+      </el-dialog>
+      <!-- 缂栬緫 -->
+      <el-dialog title="缂栬緫鍣ㄥ叿棰嗙敤鐢宠鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+        <edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
+          :copyType="copyType" @editClose="editClose" v-if="editShow" />
+      </el-dialog>
+      <el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
+        <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName'
+          :HModName='HModName' @rowEditClose="rowSetClose" v-if="printListShow" />
+        <!-- <div>111</div> -->
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import RowSettings from '@/views/component/rowSettings'
+import Edit from '@/views/scMould/warehouse/Sc_MouldOutRequestBillEdit'
+import PrintList from '@/views/component/printList'
+import moment from 'moment';
+
+export default {
+  name: 'Sc_MouldOutRequestBillList',
+  components: { RowSettings, Edit, PrintList },
+  data() {
+    return {
+      HModName: "Sc_MouldOutRequestBillList",
+      activeSeach: '',
+      editShow: false,
+      openEdit: false,
+      totalNameList: [],
+      tableShow: true,
+      openPrintList: false,
+      printListShow: false,
+      openBtnHide: false,
+      btnHideShow: false,
+      rowHideShow: false,
+      openRowHide: false,
+      copyType: 0,
+      comparatorList: [
+        { label: '=', value: '=' },
+        { label: '>=', value: '>=' },
+        { label: '>', value: '>' },
+        { label: '<=', value: '<=' },
+        { label: '<', value: '<' },
+        { label: '<>', value: '<>' },
+        { label: '鍖呭惈', value: '7' },
+        { label: '宸﹀寘鍚�', value: '8' },
+        { label: '鍙冲寘鍚�', value: '9' },
+        { label: '涓嶅寘鍚�', value: '10' },
+      ],
+      sWhere: '',
+      sTime: '',
+      eTime: '',
+      rqsgList: [
+        { label: '浠婂ぉ', value: 0 },
+        { label: '杩戜袱澶�', value: 1 },
+        { label: '杩戜笁澶�', value: 2 },
+        { label: '杩戝洓澶�', value: 3 },
+        { label: '杩戜簲澶�', value: 4 },
+        { label: '杩戝叚澶�', value: 5 },
+        { label: '杩戜竷澶�', value: 6 },
+        { label: '杩�30澶�', value: 29 },
+        { label: '杩戝崐骞�', value: 180 },
+        { label: '杩戜竴骞�', value: 365 },
+      ],
+      organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+      HStatusList: [{name:'鍏ㄩ儴',value:'-1'},{name:'鏈鏍�',value:'0'},{name:'宸插鏍�',value:'1'},{name:'宸插叧闂�',value:'2'}],
+      addBtnShow: false,
+      dialogTitle: '',
+      OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+      HInterID: null,
+      baseURL: process.env.VUE_APP_BASE_API,
+      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+      lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
+      selectedRow: null, // 褰撳墠閫変腑鐨勮
+      rowForm: {},
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        HStockOrgID: sessionStorage["OrganizationID"] - 0,
+        HStatus:'-1',
+        HDept:'',
+        HModelNumber:'',
+        HSupName:'',
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      },
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 閬僵灞�
+      loading: true,
+      tyResList: [],//鍒楄〃锛堟帴鍙f暟鎹級
+      btList: [],//琛ㄥご鍒楄〃鏄剧ず
+      btResList: [],
+      tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+      dataList: [],
+      titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+      pageSizes: [50, 100, 500, 5000, 50000],
+      page: 1,
+      pageSize: 0,
+      total: 0,
+    };
+  },
+  created() {
+    // this.fetchData()
+    this.riqiChange()
+    this.getList();
+  },
+
+  methods: {
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '鍚堣';
+          return;
+        }
+        const values = data.map(item => Number(item[column.property]));
+        if (this.totalNameList[index].totalRow) {
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0)
+
+          } else {
+            sums[index] = '';
+          }
+        }
+      }, 1000);
+      return sums;
+    },
+
+    handleBtnHide() {
+      this.btnHideShow = true
+      this.openBtnHide = true
+    },
+    handleRowHide() {
+      this.rowHideShow = true
+      this.openRowHide = true
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false
+      this.tableShow = true
+      this.openRowHide = val
+      this.getList()
+    },
+    riqiChange() {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
+      const yyyyS = start.getFullYear();
+      const mmS = String(start.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddS = String(start.getDate()).padStart(2, '0');
+      const yyyyE = end.getFullYear();
+      const mmE = String(end.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddE = String(end.getDate()).padStart(2, '0');
+      this.sTime = yyyyS + '-' + mmS + '-' + ddS
+      this.eTime = yyyyE + '-' + mmE + '-' + ddE
+    },
+    getList() {
+      this.pageSize = 50
+      this.tableShow = false
+      this.loading = true
+      if (this.sTime && !this.sWhere) {
+        this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+        this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+        this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
+        this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
+      }
+      this.sWhere += " and HSTOCKORGID=" + this.queryParams.HStockOrgID;
+      if (this.pageSize == 0) {
+        this.pageSize = 50
+      }
+      // 閿�鍞嚭搴撳崟鍒楄〃
+      axios.get(this.baseURL + '/Sc_MouldOutRequestBillController/page', {
+        params: {
+          "sWhere": this.sWhere,
+          "user": sessionStorage["HUserName"],
+          "page": this.page,
+          "size": this.pageSize
+        },
+      }).then(response => {
+        this.tyResList = response.data.data//鎬绘暟鎹�
+        let data1 = response.data
+        let option = []
+        if (data1.code == 1) {
+          this.btResList = data1.list//閿�鍞嚭搴撳崟鎺ュ彛琛ㄥご鏁版嵁
+          this.total = data1.count;
+          var data = [];//鍒楀瓧娈垫暟鎹�
+          var col = [];
+          var totalArray = ["浠舵暟"];
+          //缁欑┖鐨勬暟缁勮祴鍊�
+          for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+            var patrn = new RegExp(/^h/i);
+            if (patrn.test(data1.list[key].ColmCols)) {
+                this.titleData[key] = data1.list[key].ColmCols;
+            }
+          }
+          //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+          col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+          for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+            if (this.titleData.indexOf(data[i].name) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁$畻鍒�
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+            } else if (totalArray.indexOf(data[i].name) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁$畻鍒�
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+            }
+            else {
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+            }
+
+          }
+          option.cols = [col]
+          option.data = data1.data
+          this.dataList = option
+          this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    DisPlay_HideColumn(HModName, user, option, dataOption) {
+      this.totalNameList = []
+      axios.get(this.baseURL + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
+        params: {
+          "HModName": HModName,
+          "user": user,
+        },
+      }).then(res => {        
+        let data1 = res.data
+        if (data1.data.length != 0) {       
+          var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+          var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+          newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+          dataCol = data1.data[0].HGridString.split(',');
+          //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+          if (dataCol.length == option.cols[0].length - 1) {                
+            //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+            for (var j = 0; j < option.cols[0].length - 1; j++) {
+              for (var i = 0; i < option.cols[0].length - 1; i++) {
+                var dataCols = dataCol[j].split('|');
+                //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                  //闅愯棌鍒�
+                  if (dataCols[1] == 1) {
+                    option.cols[0][i + 1]["hide"] = true;
+                  }
+                  //璁剧疆鍒楀
+                  if (dataCols[3] > 0) {
+                    option.cols[0][i + 1]["width"] = dataCols[3];
+                  }
+                  //璁剧疆鍐呭瀛椾綋澶у皬
+                  if (data1.data[0].HFontSize != 0) {
+                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                  } else {
+                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                  }
+                  //鏄剧ず鍒�
+                  if (dataCols[1] == 0 && this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1) {
+                    option.cols[0][i + 1]["hide"] = false;
+                  }
+                  //缁熻鍒�
+                  if (dataCols[6] == 1) {
+                    option.cols[0][i + 1]["totalRow"] = true;
+                  } else {
+                    option.cols[0][i + 1]["totalRow"] = false;
+                  }
+                  //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                  switch (dataCols[2]) {
+                    case "L":
+                      option.cols[0][i + 1]["align"] = "left";
+                      break;
+                    case "M":
+                      option.cols[0][i + 1]["align"] = "center";
+                      break;
+                    case "R":
+                      option.cols[0][i + 1]["align"] = "right";
+                      break;
+                  }
+                  //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                  if (dataCols[4] != null && dataCols[4] != "") {
+                    option.cols[0][i + 1]["title"] = dataCols[4];
+                  }
+                  newCols[0].push(option.cols[0][i + 1]);
+                  break;
+                }
+              }
+            }
+            //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+            if (dataCol.length == newCols[0].length - 1) {
+              option.cols = newCols;
+              //鍙栨秷鍐荤粨鍒�
+              for (var i = 1; i < option.cols[0].length - 1; i++) {
+                if (option.cols[0][i + 1]["fixed"] != null) {
+                  option.cols[0][i + 1]["fixed"] = null;
+                }
+                else {
+                  break;
+                }
+              }
+              //鍐荤粨鍒�
+              if (data1.data[0].HFixCols != 0) {
+                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                  if (dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1) {
+                    data1.data[0].HFixCols += 1;
+                  }
+
+                  option.cols[0][i + 1]["fixed"] = "left";
+                }
+              }
+              //璁剧疆鍒楁帓搴�
+              for (var i = 1; i < option.cols[0].length; i++) {
+                if (data1.data[0].HSortFlag == "鏄�") {
+                  option.cols[0][i]["sort"] = true;
+                }
+                else {
+                  option.cols[0][i]["sort"] = false;
+                }
+              }
+            }
+          }
+          this.btList = option.cols[0]
+          this.btList.map(item => {
+            if (!item.hide) {
+              this.totalNameList.push(item)
+            }
+          })
+          if (data1.data[0].HPageSize == 0) {
+            this.pageSize = 50
+          } else {
+            this.pageSize = data1.data[0].HPageSize
+          }
+          this.tableData = option.data
+          this.tableShow = true
+          this.loading = false
+        } else {
+          this.btList = dataOption.cols[0]
+          this.btList.map(item => {
+            if (!item.hide) {
+              this.totalNameList.push(item)
+            }
+          })
+          this.tableData = dataOption.data
+          this.tableShow = true
+          this.loading = false
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    renderHeader(h, { column, $index }) {// 鏂板缓涓�涓� span
+      let span = document.createElement(span)// 璁剧疆琛ㄥご鍚嶇О
+      span.innerText = column.label
+      //涓存椂鎻掑叆 document
+      document.body.appendChild(span)// 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
+      document.body.removeChild(span)
+      return h(span, column.label)
+    },
+    //鐐瑰嚮琛�
+    handleRowClick(row, column, event) {
+      this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆¢�変腑鐨勮
+      this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+      this.lastSelectedRowIndex = this.tableData.indexOf(row);
+      this.$refs.tableData.toggleRowSelection(row);
+    },
+    //閫変腑琛岄珮浜牱寮�
+    rowStyle({ row, rowIndex }) {
+      if (this.ids.includes(row.hmainid)) {
+        return { "background": "#ecf5ff" }
+      }
+    },
+    //鍙屽嚮琛�
+    handleDblclick(row, column, cell, event) {
+      this.OperationType = 2
+      this.handleEdit()
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      // this.rowForm = {}
+      this.ids = selection.map(item => item.hmainid)
+      this.single = selection.length != 1
+      this.multiple = !selection.length
+      if (!this.single) {
+        this.rowForm = selection[0]
+      }
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.sWhere = ''
+      if (this.queryParams.ColName && this.queryParams.Comparator) {
+        var com = "";
+        switch (this.queryParams.Comparator) {
+          case "7":
+            com = "like'%" + this.queryParams.ColContent + "%'";
+            break;
+          case "8":
+            com = "like'%" + this.queryParams.ColContent + "'";
+            break;
+          case "9":
+            com = "like'" + this.queryParams.ColContent + "%'";
+            break;
+          case "10":
+            com = "not like'%" + this.queryParams.ColContent + "%'";
+            break;
+          default:
+            com = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName + " " + com;
+      }
+      if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+        var com1 = "";
+        switch (this.queryParams.Comparator1) {
+          case "7":
+            com1 = "like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "8":
+            com1 = "like'%" + this.queryParams.ColContent1 + "'";
+            break;
+          case "9":
+            com1 = "like'" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "10":
+            com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          default:
+            com1 = "" + this.queryParams.Comparator1 + "'" + this.queryParams.ColContent1 + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+      }
+      if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+        var com2 = "";
+        switch (this.queryParams.Comparator2) {
+          case "7":
+            com2 = "like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "8":
+            com2 = "like'%" + this.queryParams.ColContent2 + "'";
+            break;
+          case "9":
+            com2 = "like'" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "10":
+            com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          default:
+            com2 = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+      }
+      if (this.sTime) {
+        this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+        this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
+      }
+      if (this.eTime) {
+        this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+        this.sWhere += " and 鏃ユ湡 <= '" + this.eTime + "'";
+      }
+      if (this.queryParams.HBillNo) {
+        this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
+      }
+      if (this.queryParams.HDept) {
+        this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
+      }
+      if (this.queryParams.HModelNumber) {
+        this.sWhere += " and 妯″叿浠g爜 like '%" + this.queryParams.HModelNumber + "%'";
+      }
+      if (this.queryParams.HSupName) {
+        this.sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
+      }
+      this.getList()
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.sWhere = ''
+      this.queryParams = {
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        HStockOrgID: sessionStorage["OrganizationID"] - 0,
+        HStatus:'-1',
+        HDept:'',
+        HModelNumber:'',
+        HSupName:'',
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      }
+      this.riqiChange()
+      this.resetForm("queryForm")
+      this.getList()
+    },
+
+    //閫�鍑�
+    close() {
+      // this.reset()
+      this.tableShow = true
+      this.openEdit = false
+      this.editShow = false
+      this.getList()
+    },
+    //鎵撳紑鏂板缁勪欢寮圭獥
+    handleAddEdit() {
+      this.rowForm.hmainid = 0
+      this.editShow = true
+      this.openEdit = true
+    },
+    //鎵撳紑淇敼缁勪欢寮圭獥
+    handleEdit(row) {
+      this.rowForm = row
+      this.editShow = true
+      this.openEdit = true
+    },
+    //鍏抽棴缂栬緫椤甸潰
+    editClose(val) {
+      this.open = val
+      this.editShow = false
+      this.openEdit = val
+      this.getList()
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete() {
+      this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+        axios.get(this.baseURL + "/Sc_MouldOutRequestBillController/GetSc_MouldOutRequestBill_Delete_Json", {
+            params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
+          }).then(response => {
+            if (response.data.count == 1) {
+              this.getList()
+              this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+            } else {
+              this.$modal.msgError("閿欒:" + result.code + result.Message);
+            }
+          }).catch(error => {
+            this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+          });
+      }).catch(() => { })
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.hmainid || form.HInterID
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Sc_MouldOutRequestBillController/GetSc_MouldOutRequestBill_Check_Json", {
+        params: { "HInterID": InterID, "Type": num, "HMaker": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.count == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+          this.getList();
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    // 鎵归噺鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBillAll(num, ids) {
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Sc_MouldOutRequestBillController/CheckAll", {
+        params: { "ids": ids, "Type": num, "HMaker": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.count == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+          this.getList();
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //瀵煎嚭
+    handleExport() {
+      const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
+      const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
+      this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
+      this.$XLSX.writeFile(wb, `sellOutBill_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢      
+    },
+    //鎵撳嵃
+    get_PrintReport() {
+      if (this.ids.length != 1) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
+        this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
+      } else {
+        axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
+          params: { "HInterID": this.rowForm.hmainid }
+        }).then(response => {
+          var result = response.data
+          if (result.count == 1) {
+            this.printListShow = true
+            this.openPrintList = true
+            // this.$router.push({ path:'/printList', query: { linterid: this.rowForm.hmainid,MyMsg:this.rowForm.hmainid,Type:'Kf_SellOutBillList' }})
+          } else {
+            this.$modal.msgError(result.code + result.Message)
+          }
+        }).catch(error => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+
+
+      }
+      //  var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
+    },
+
+    //#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
+    defaintOperationByCompanyName() {
+      var result = false;
+      axios.get(this.baseURL + '/Xt_getInfo/getCompanyName').then(response => {
+        var data1 = response.data
+        if (data1.count == 1) {
+          if (data1.data == "姘村姟") {
+            result = true;
+          }
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+      return result;
+    },
+  }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
index 5d0c77f..3694c0e 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
@@ -675,19 +675,19 @@
         this.sWhere += " and 缁勭粐鍚嶇О like '%" + this.queryParams.HStockOrgName + "%'";
       }
       if (this.queryParams.HDept) {
-          sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
+          this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
       }
       if (this.queryParams.HMaterNumber) {
-          sWhere += " and 鐗╂枡浠g爜 like '%" + this.queryParams.HMaterNumber + "%'";
+          this.sWhere += " and 鐗╂枡浠g爜 like '%" + this.queryParams.HMaterNumber + "%'";
       }
       if (this.queryParams.HModelNumber) {
-          sWhere += " and 妯″叿浠g爜 like '%" + this.queryParams.HModelNumber + "%'";
+          this.sWhere += " and 妯″叿浠g爜 like '%" + this.queryParams.HModelNumber + "%'";
       }
       if (this.queryParams.HWhName) {
-          sWhere += " and 浠撳簱 like '%" + this.queryParams.HWhName + "%'";
+          this.sWhere += " and 浠撳簱 like '%" + this.queryParams.HWhName + "%'";
       }
       if (this.queryParams.HSupName) {
-          sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
+          this.sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
       }
       this.getList()
     },
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
index c4d4a8d..2dea67a 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
@@ -675,19 +675,19 @@
         this.sWhere += " and 缁勭粐鍚嶇О like '%" + this.queryParams.HStockOrgName + "%'";
       }
       if (this.queryParams.HDept) {
-          sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
+          this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
       }
       if (this.queryParams.HMaterNumber) {
-          sWhere += " and 鐗╂枡浠g爜 like '%" + this.queryParams.HMaterNumber + "%'";
+          this.sWhere += " and 鐗╂枡浠g爜 like '%" + this.queryParams.HMaterNumber + "%'";
       }
       if (this.queryParams.HModelNumber) {
-          sWhere += " and 妯″叿浠g爜 like '%" + this.queryParams.HModelNumber + "%'";
+          this.sWhere += " and 妯″叿浠g爜 like '%" + this.queryParams.HModelNumber + "%'";
       }
       if (this.queryParams.HWhName) {
-          sWhere += " and 浠撳簱 like '%" + this.queryParams.HWhName + "%'";
+          this.sWhere += " and 浠撳簱 like '%" + this.queryParams.HWhName + "%'";
       }
       if (this.queryParams.HSupName) {
-          sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
+          this.sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
       }
       this.getList()
     },
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
index 06b0aea..38aa162 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
@@ -669,19 +669,19 @@
         this.sWhere += " and 缁勭粐鍚嶇О like '%" + this.queryParams.HStockOrgName + "%'";
       }
       if (this.queryParams.HDept) {
-          sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
+          this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
       }
       if (this.queryParams.HMaterNumber) {
-          sWhere += " and 鐗╂枡浠g爜 like '%" + this.queryParams.HMaterNumber + "%'";
+          this.sWhere += " and 鐗╂枡浠g爜 like '%" + this.queryParams.HMaterNumber + "%'";
       }
       if (this.queryParams.HModelNumber) {
-          sWhere += " and 妯″叿浠g爜 like '%" + this.queryParams.HModelNumber + "%'";
+          this.sWhere += " and 妯″叿浠g爜 like '%" + this.queryParams.HModelNumber + "%'";
       }
       if (this.queryParams.HWhName) {
-          sWhere += " and 浠撳簱 like '%" + this.queryParams.HWhName + "%'";
+          this.sWhere += " and 浠撳簱 like '%" + this.queryParams.HWhName + "%'";
       }
       if (this.queryParams.HSupName) {
-          sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
+          this.sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
       }
       this.getList()
     },

--
Gitblit v1.9.1