From 7fb0a8f0ab16c149484bf043754cd10cfa94de2f Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期一, 19 一月 2026 14:48:05 +0800
Subject: [PATCH] 增加了业务员,保管员和验收员的对应的显示

---
 src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue | 1165 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 743 insertions(+), 422 deletions(-)

diff --git a/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue b/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
index 984378d..14da118 100644
--- a/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
+++ b/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
@@ -1,13 +1,17 @@
 <template>
   <div v-loading="formLoading" v-if="formShow">
-    <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
+    <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="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>
+    <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">
@@ -19,19 +23,28 @@
             </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
+                  v-model="form.HDate"
+                  type="date"
+                  placeholder="閫夋嫨鏃ユ湡"
+                  value-format="yyyy-MM-ddT"
+                >
                 </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="杈呭姪瀛楁" prop="HInnerBillNo">
-                <el-input v-model="form.HInnerBillNo" placeholder="" disabled/>
+                <el-input v-model="form.HInnerBillNo" placeholder="" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
                 <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨寰�鏉ュ崟浣�" disabled>
-                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(6)"></el-button>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="openDataDialog(6)"
+                  ></el-button>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -40,28 +53,44 @@
             <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-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-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-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-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="openDataDialog(4, (empType = 4))"
+                  ></el-button>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -70,27 +99,67 @@
             <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-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="openDataDialog(2, (eHWHType = 1))"
+                  ></el-button>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="璋冨嚭浠撳簱" prop="HSCWHName">
                 <el-input v-model="form.HSCWHName" placeholder="璇烽�夋嫨璋冨嚭浠撳簱" disabled>
-                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=2)"></el-button>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="openDataDialog(2, (eHWHType = 2))"
+                  ></el-button>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="閮ㄩ棬" prop="HDeptName">
                 <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
-                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="openDataDialog(1)"
+                  ></el-button>
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="澶囨敞" prop="HRemark">
                 <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="璋冨叆缁勭粐" prop="HSTOCKINORGID" >
+                <el-select v-model="form.HSTOCKINORGID" placeholder="璇烽�夋嫨璋冨叆缁勭粐" :disabled="OperationType == 3" @change="StockInOrgChangeHandler">
+                  <el-option
+                    v-for="(item, index) in organizationList"
+                    :key="index"
+                    :label="item.Name"
+                    :value="item.ID.toString()"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="璋冨嚭缁勭粐" prop="HSTOCKOUTORGID">
+                <el-select v-model="form.HSTOCKOUTORGID" placeholder="璇烽�夋嫨璋冨嚭缁勭粐" :disabled="OperationType == 3" @change="StockOutOrgChangeHandler">
+                  <el-option
+                    v-for="(item, index) in organizationList"
+                    :key="index"
+                    :label="item.Name"
+                    :value="item.ID.toString()"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -121,25 +190,45 @@
           <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
+                  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
+                  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
+                  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
+                  v-model="form.HCloseDate"
+                  type="date"
+                  placeholder="閫夋嫨鍏抽棴鏃ユ湡"
+                  disabled
+                >
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -154,7 +243,12 @@
           <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
+                  v-model="form.HDeleteDate"
+                  type="date"
+                  placeholder="閫夋嫨浣滃簾鏃ユ湡"
+                  disabled
+                >
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -164,24 +258,69 @@
 
       <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 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
+            :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.HMaterID" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(3, scope.row)"
-                  @dblclick.native="openDataDialog(3, scope.row)" />
+                <el-input
+                  v-model="scope.row.鐗╂枡浠g爜"
+                  placeholder="璇疯緭鍏�"
+                  @keyup.native.f7="openDataDialog(3, scope.row)"
+                  @dblclick.native="openDataDialog(3, scope.row)"
+                />
               </template>
             </el-table-column>
             <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
@@ -197,6 +336,16 @@
             <el-table-column align="center" label="璁¢噺鍗曚綅" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.璁¢噺鍗曚綅 }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="杈呭姪灞炴��" width="120">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="scope.row.杈呭姪灞炴��"
+                  placeholder="璇疯緭鍏�"
+                  @keyup.native.f7="openDataDialog(7, scope.row)"
+                  @dblclick.native="openDataDialog(7, scope.row)"
+                />
               </template>
             </el-table-column>
             <el-table-column align="center" label="鎹㈢畻鐜�" width="120">
@@ -216,8 +365,12 @@
             </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>
+                <el-input-number
+                  v-model="scope.row.HQty"
+                  :min="1"
+                  style="width: 90px"
+                  controls-position="right"
+                ></el-input-number>
               </template>
             </el-table-column>
             <el-table-column align="center" label="鍗曚环" width="120">
@@ -242,14 +395,22 @@
             </el-table-column>
             <el-table-column align="center" label="璋冨叆浠撳簱" width="120">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.璋冨叆浠撳簱" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=3)"
-                  @dblclick.native="openDataDialog(2, scope.row ,eHWHType=3)" />
+                <el-input
+                  v-model="scope.row.璋冨叆浠撳簱"
+                  placeholder="璇疯緭鍏�"
+                  @keyup.native.f7="openDataDialog(2, scope.row, (eHWHType = 3))"
+                  @dblclick.native="openDataDialog(2, scope.row, (eHWHType = 3))"
+                />
               </template>
             </el-table-column>
             <el-table-column align="center" label="璋冨嚭浠撳簱" width="120">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.璋冨嚭浠撳簱" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=4)"
-                  @dblclick.native="openDataDialog(2, scope.row ,eHWHType=4)" />
+                <el-input
+                  v-model="scope.row.璋冨嚭浠撳簱"
+                  placeholder="璇疯緭鍏�"
+                  @keyup.native.f7="openDataDialog(2, scope.row, (eHWHType = 4))"
+                  @dblclick.native="openDataDialog(2, scope.row, (eHWHType = 4))"
+                />
               </template>
             </el-table-column>
             <el-table-column align="center" label="鍩烘湰璁¢噺鍗曚綅" width="120">
@@ -267,54 +428,118 @@
                 <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
               </template>
             </el-table-column>
+            <el-table-column align="center" label="缁勭粐" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HSTOCKORGID" disabled />
+              </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>
+                <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" />
-      <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="materialShow" />
+    <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"
+      />
+      <Material
+        @deptEmitDb="dbEmitData"
+        @deptEmit="emitData"
+        :openPage="HModName"
+        v-if="materialShow"
+      />
+      <GyProperty
+        @deptEmitDb="dbEmitData"
+        @deptEmit="emitData"
+        :openPage="HModName"
+        v-if="propertyShow"
+      />
       <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
+      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 Material from '@/views/gyMaterial/GyMaterial.vue'
-import moment from 'moment';
+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 Material from "@/views/gyMaterial/GyMaterial.vue";
+import GyProperty from "@/views/basic/gyProperty/gyPropertyList.vue";
+import moment from "moment";
 
 export default {
-  name: 'Kf_MoveStockRequestBillEdit',
-  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,Material },
+  name: "Kf_MoveStockRequestBillEdit",
+  components: {
+    Dept,
+    Warehouse,
+    RowSettings,
+    GyEmployee,
+    GySupplier,
+    Material,
+    GyProperty,
+  },
   props: {
-    OperationType: { type: Number, },
-    linterid: { type: Number, },
-    HSouceBillType: { type: String, },
-    propsData: { type: String, },
-    copyType: { type: Number, },
+    OperationType: { type: Number },
+    linterid: { type: Number },
+    HSouceBillType: { type: String },
+    propsData: { type: String },
+    copyType: { type: Number },
   },
   data() {
     return {
@@ -326,30 +551,31 @@
       openRowHide: false,
       addBtnShow: false,
       zbIndex: null,
-      zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
-      dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
-      deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
-      warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
-      gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
-      gySupplierShow: false,//渚涘簲鍟嗘暟鎹粍浠�
-      materialShow: false,//鐗╂枡鏁版嵁缁勪欢
-      eHWHType:1,//浠撳簱寮圭獥鍖哄垎鏍囧織
-      empType:1,//鑱屽憳寮圭獥鍖哄垎鏍囧織
-      deptform: {},//寮圭獥閫変腑鏁版嵁
-      openData: false,//鏁版嵁寮圭獥
-      dialogTitle: '',
-      organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
-      subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+      zbSelForm: {}, //瀛愯〃閫変腑鏁版嵁
+      dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+      deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢
+      warehouseShow: false, //浠撳簱鏁版嵁缁勪欢
+      gyEmployeeShow: false, //閿�鍞憳鏁版嵁缁勪欢
+      gySupplierShow: false, //渚涘簲鍟嗘暟鎹粍浠�
+      materialShow: false, //鐗╂枡鏁版嵁缁勪欢
+      propertyShow: false, // 杈呭姪灞炴�у熀纭�璧勬枡
+      eHWHType: 1, //浠撳簱寮圭獥鍖哄垎鏍囧織
+      empType: 1, //鑱屽憳寮圭獥鍖哄垎鏍囧織
+      deptform: {}, //寮圭獥閫変腑鏁版嵁
+      openData: false, //鏁版嵁寮圭獥
+      dialogTitle: "",
+      organizationList: JSON.parse(sessionStorage.getItem('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: [],//瀛愯〃琛ㄥご
-      allVal:[],
-      activeName: 'first',
-      activeName1:'first',
+      editData: [], //瀛愯〃
+      editData1: [], //姹囨�诲瓙琛�
+      editBtData: [], //瀛愯〃琛ㄥご
+      allVal: [],
+      activeName: "first",
+      activeName1: "first",
       // 寮瑰嚭灞傛爣棰�
       title: "",
       // 鏄惁鏄剧ず寮瑰嚭灞�
@@ -358,21 +584,21 @@
       dateRange: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
-        HBillNo: '',
+        HBillNo: "",
         HInitTimeCycle: 29,
-        HProjectNumber: '',
+        HProjectNumber: "",
         HCusID: null,
-        HMaterNumber: '',
-        HMaterName: '',
-        ColName1: '',
-        ColName2: '',
-        ColName: '',
-        Comparator1: '',
-        Comparator2: '',
-        Comparator: '',
-        ColContent1: '',
-        ColContent2: '',
-        ColContent: '',
+        HMaterNumber: "",
+        HMaterName: "",
+        ColName1: "",
+        ColName2: "",
+        ColName: "",
+        Comparator1: "",
+        Comparator2: "",
+        Comparator: "",
+        ColContent1: "",
+        ColContent2: "",
+        ColContent: "",
       },
       // 鏄剧ず鎼滅储鏉′欢
       showSearch: true,
@@ -389,48 +615,44 @@
       form: {},
       // 琛ㄥ崟鏍¢獙
       rules: {
-        HDate: [
-          { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
-        ],
-        HSupName: [
-          { required: true, message: "寰�鏉ュ崟浣嶄笉鑳戒负绌�", trigger: "blur" }
-        ],
-        HEmpName: [
-          { required: true, message: "涓氬姟鍛樹笉鑳戒负绌�", trigger: "blur" }
-        ],        
-        HMangerName: [
-          { required: true, message: "涓荤涓嶈兘涓虹┖", trigger: "blur" }
-        ],
-        HSecManagerName: [
-          { required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
-        ],
-        HKeeperName: [
-          { required: true, message: "淇濈鍛樹笉鑳戒负绌�", trigger: "blur" }
-        ],        
-        HWHName: [
-          { required: true, message: "璋冨叆浠撳簱涓嶈兘涓虹┖", trigger: "blur" }
-        ],
-        HSCWHName: [
-          { required: true, message: "璋冨嚭浠撳簱涓嶈兘涓虹┖", trigger: "blur" }
-        ],
-        HDeptName: [
-          { required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }
-        ],
-      }
+        HDate: [{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }],
+        HSupName: [{ required: true, message: "寰�鏉ュ崟浣嶄笉鑳戒负绌�", trigger: "blur" }],
+        HEmpName: [{ required: true, message: "涓氬姟鍛樹笉鑳戒负绌�", trigger: "blur" }],
+        HMangerName: [{ required: true, message: "涓荤涓嶈兘涓虹┖", trigger: "blur" }],
+        HSecManagerName: [{ required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }],
+        HKeeperName: [{ required: true, message: "淇濈鍛樹笉鑳戒负绌�", trigger: "blur" }],
+        HWHName: [{ required: true, message: "璋冨叆浠撳簱涓嶈兘涓虹┖", trigger: "blur" }],
+        HSCWHName: [{ required: true, message: "璋冨嚭浠撳簱涓嶈兘涓虹┖", trigger: "blur" }],
+        HDeptName: [{ required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }],
+      },
     };
   },
   created() {
     this.getdata()
   },
   methods: {
+    StockInOrgChangeHandler(e) {
+      for(let i=0;i<this.editData.length;i++) {
+        this.editData[i].HSTOCKORGINID = e
+      }
+    },
+    StockOutOrgChangeHandler(e) {
+      for(let i=0;i<this.editData.length;i++) {
+        this.editData[i].HOtherOrgID = e
+        this.editData[i].HSTOCKORGID = e
+      }
+    },
     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()
+      this.formShow = false;
+      this.formLoading = true;
+      // 璋冨嚭缁勭粐榛樿涓虹櫥褰曠敤鎴风粍缁�
+      if (
+        (this.OperationType == 1 && this.copyType != 1) ||
+        (!this.OperationType && !this.copyType)
+      ) {
+        this.handleAdd();
       } else if (this.OperationType == 3 || this.copyType == 1) {
-        this.handleUpdate()
+        this.handleUpdate();
       }
     },
     // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
@@ -442,285 +664,339 @@
       return datajson;
     },
     handleRowHide() {
-      this.rowHideShow = true
-      this.openRowHide = true
+      this.rowHideShow = true;
+      this.openRowHide = true;
     },
     rowSetClose(val) {
-      this.rowHideShow = false
-      this.openRowHide = val
+      this.rowHideShow = false;
+      this.openRowHide = val;
     },
 
     HStockOrgChange(val) {
-      console.log(549,val,this.zbIndex)
-      console.log(this.organizationList)
-      
+      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)
+      console.log(deptRow, num);
       if (deptRow.HItemID || deptRow.hmainid) {
         if (num == 1) {
-          this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
-          this.form.HDeptID = deptRow.HItemID
-          this.deptShow = false
-          this.openData = false
+          this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О;
+          this.form.HDeptID = 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
-          }else if(this.eHWHType == 2){
-            this.form.HSCWHName = deptRow.浠撳簱鍚嶇О
-            this.form.HSCWHID = deptRow.HItemID
-          }else if(this.eHWHType == 3){
-            this.editData[this.zbIndex].HWHID = deptRow.HItemID
-            this.editData[this.zbIndex].璋冨叆浠撳簱 = deptRow.浠撳簱鍚嶇О
-          }else if(this.eHWHType == 4){
-            this.editData[this.zbIndex].HSCWHID = deptRow.HItemID
-            this.editData[this.zbIndex].璋冨嚭浠撳簱 = deptRow.浠撳簱鍚嶇О
+          if (this.eHWHType == 1) {
+            this.form.HWHName = deptRow.浠撳簱鍚嶇О;
+            this.form.HWHID = deptRow.HItemID;
+          } else if (this.eHWHType == 2) {
+            this.form.HSCWHName = deptRow.浠撳簱鍚嶇О;
+            this.form.HSCWHID = deptRow.HItemID;
+          } else if (this.eHWHType == 3) {
+            this.editData[this.zbIndex].HWHID = deptRow.HItemID;
+            this.editData[this.zbIndex].璋冨叆浠撳簱 = deptRow.浠撳簱鍚嶇О;
+          } else if (this.eHWHType == 4) {
+            this.editData[this.zbIndex].HSCWHID = deptRow.HItemID;
+            this.editData[this.zbIndex].璋冨嚭浠撳簱 = deptRow.浠撳簱鍚嶇О;
           }
-          this.warehouseShow = false
-          this.openData = false
-        } else if (num == 3){
-
-            this.editData[this.zbIndex].HMaterID = deptRow.HItemID
-            this.editData[this.zbIndex].鐗╂枡浠g爜 = deptRow.鐗╂枡浠g爜
-            this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О
-            this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿
-            this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
-            this.editData[this.zbIndex].璁¢噺鍗曚綅 = deptRow.璁¢噺鍗曚綅鍚嶇О
-            this.materialShow = false
-            this.openData = false
+          this.warehouseShow = false;
+          this.openData = false;
+        } else if (num == 3) {
+          console.log(deptRow);
+          this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
+          this.editData[this.zbIndex].鐗╂枡浠g爜 = deptRow.鐗╂枡浠g爜;
+          this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
+          this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿;
+          this.editData[this.zbIndex].璁¢噺鍗曚綅 = deptRow.璁¢噺鍗曚綅鍚嶇О;
+          this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
+          this.materialShow = 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
+          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
-        } 
+          this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�;
+          this.form.HSupID = deptRow.HItemID;
+          this.gySupplierShow = false;
+          this.openData = false;
+        } else if (num == "gyProperty") {
+          this.editData[this.zbIndex].HAuxPropID = deptRow.HItemID;
+          this.editData[this.zbIndex]["杈呭姪灞炴��"] = deptRow["杈呭姪灞炴�у悕绉�"];
+
+          this.propertyShow = false;
+          this.openData = false;
+        }
       } else {
         this.$modal.msgError("璇烽�夋嫨鍗曟潯鏁版嵁!");
       }
-
     },
     emitData(deptRow, num) {
-      this.dialogTypeNum = num
-      this.deptform = deptRow
+      this.dialogTypeNum = num;
+      this.deptform = deptRow;
     },
     deptClickSub() {
-      this.dbEmitData(this.deptform, this.dialogTypeNum)
-      this.deptform = {}
+      this.dbEmitData(this.deptform, this.dialogTypeNum);
+      this.deptform = {};
     },
     deptClose() {
-      this.deptform = {}
-      this.openData = false
+      this.deptform = {};
+      this.openData = false;
     },
 
     //琛ㄥ崟鍒濆鍖�
     reset() {
       this.form = {
-        HBillNo: '',
+        HBillNo: "",
         HInterID: 0,
         HDate: new Date(),
-        HSupTypeID:1,
-        HSupName:'',
-        HSupID:0,
-        HDeptName: sessionStorage["HDept"] || '',
+        HSupTypeID: 1,
+        HSupName: "",
+        HSupID: 0,
+        HDeptName: sessionStorage["HDept"] || "",
         HDeptID: sessionStorage["HDeptID"] || 0,
-        HWHName:'',
-        HWHID:0,
-        HSCWHName:'',
-        HSCWHID:0,
-        HEmpName:'',
-        HEmpID:'',
-        HMangerName:'',
-        HMangerID:'',
-        HSecManagerName:'',
-        HSecManagerID:'',
-        HKeeperName:'',
-        HKeeperID:'',
-        HExplanation:'',
-        HRemark:'',
+        HWHName: "",
+        HWHID: 0,
+        HSCWHName: "",
+        HSCWHID: 0,
+        HEmpName: "",
+        HEmpID: "",
+        HMangerName: "",
+        HMangerID: "",
+        HSecManagerName: "",
+        HSecManagerID: "",
+        HKeeperName: "",
+        HKeeperID: "",
+        HExplanation: "",
+        HRemark: "",
 
-        HMaker: '',
-        HUpDater: '',
-        HChecker: '',
+        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
+        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.activeName = "first";
+      this.activeName1 = "first";
       this.resetForm("form");
     },
     //閫�鍑�
     close() {
-      this.reset()
-      console.log(this.$route.path)
+      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]
+        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)
+            this.$router.push(latestView.fullPath);
           } else {
-            if (obj.name === 'Dashboard') {
-              this.$router.replace({ path: '/redirect' + obj.fullPath })
+            if (obj.name === "Dashboard") {
+              this.$router.replace({ path: "/redirect" + obj.fullPath });
             } else {
-              this.$router.push('/')
+              this.$router.push("/");
             }
           }
         });
       } else {
-        this.formShow = false
-        this.$emit('editClose', false)
+        this.formShow = false;
+        this.$emit("editClose", false);
       }
     },
     //鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
     getCzyglByUser() {
-        if(this.form.HDeptID && this.form.HDeptID!=0){
-            axios.get(this.baseURL + '/Gy_Department/list', {
-                params: { "sWhere": "and HItemID = '" + this.form.HDeptID + "'", "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"] }
-            }).then(response => {
-                let dataForm = response.data.data[0]
-                this.form.HMangerID = dataForm.HEmpID
-                this.form.HMangerName = dataForm.璐熻矗浜�
-            }).catch(error => {
-                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-            });
-        }
+      console.log(this.form.HDeptID && this.form.HDeptID != 0);
+      if (this.form.HDeptID && this.form.HDeptID != 0) {
+        axios
+          .get(this.$baseUrl + "/Gy_Department/list", {
+            params: {
+              sWhere: "and HItemID = '" + this.form.HDeptID + "'",
+              user: sessionStorage["HUserName"],
+              Organization: sessionStorage["Organization"],
+            },
+          })
+          .then((response) => {
+            let dataForm = response.data.data;
+            if (dataForm.length > 0) {
+              this.form.HMangerName = dataForm[0].璐熻矗浜�;
+              this.form.HMangerID = dataForm[0].HEmpID;
+            }
+          })
+          .catch((error) => {
+            this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+          });
+      }
     },
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
-      this.reset()
+      this.reset();
       //鏂板鑾峰彇鍗曟嵁鍙�
-      this.getHBillNo()
-      let date = new Date()
-      this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+      this.getHBillNo();
+      let date = new Date();
+      this.$set(this.form, "HSTOCKOUTORGID", sessionStorage["OrganizationID"]);
+      this.$set(this.form, "HSTOCKINORGID", sessionStorage["OrganizationID"]);
+      this.$set(this.form, "HDate", moment(date).format("YYYY-MM-DD HH:mm:ss"));
       if (this.OperationType == 1) {
-        this.handleAddSysZb()
+        this.handleAddSysZb();
       }
       this.$nextTick(() => {
-        this.formShow = true
-        this.formLoading = false
-      })
+        this.formShow = true;
+        this.formLoading = false;
+      });
     },
     getHBillNo() {
-      axios.get(this.baseURL + "/Web/GetMAXNum", {
-        params: {
-          HBillType: '1243'
-        }
-      }).then(response => {
-        this.form.HMaker = sessionStorage["HUserName"]
-        this.form.HBillNo = response.data.data[0].HBillNo
-        this.form.HInterID = response.data.data[0].HInterID
-        this.getCzyglByUser()
-      }).catch(error => {
-        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-      });
+      axios
+        .get(this.$baseUrl + "/Web/GetMAXNum", {
+          params: {
+            HBillType: "1243",
+          },
+        })
+        .then((response) => {
+          this.form.HMaker = sessionStorage["HUserName"];
+          this.form.HBillNo = response.data.data[0].HBillNo;
+          this.form.HInterID = response.data.data[0].HInterID;
+          this.getCzyglByUser();
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate() {
-      this.reset()
-      let rowHmainid = this.linterid
-      console.log(this.linterid)
+      this.reset();
+      let rowHmainid = this.linterid;
+      console.log(this.linterid);
       //涓昏〃
-      axios.get(this.baseURL + "/Kf_MoveStockRequestBill/cx", {
-        params: { 'HInterID': rowHmainid }
-      }).then(response => {
-        if (response.data.count == 1) {
-          var result = response.data
-          var data = response.data.data
-          if (this.copyType == 1) {
-            this.getHBillNo()
-            let date = new Date()
-            this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
-          } else {
-            this.allVal = data[0]
+      axios
+        .get(this.$baseUrl + "/Kf_MoveStockRequestBill/cx", {
+          params: { HInterID: rowHmainid },
+        })
+        .then((response) => {
+          if (response.data.count == 1) {
+            var result = response.data;
+            var data = response.data.data;
+            console.log(result, data);
+
+            this.allVal = data[0];
             this.form = {
-                "HBillNo": data[0].鍗曟嵁鍙�
-                , "HDate": data[0].鏃ユ湡
-                , "HDeptName": data[0].閮ㄩ棬
-                , "HDeptID": data[0].HDeptID
-                , "HSupID": data[0].HSupID
-                , "HSupName": data[0].寰�鏉ュ崟浣�
-                , "HEmpID": data[0].HEmpID
-                , "HEmpName": data[0].涓氬姟鍛�                             
-                , "HMangerName": data[0].涓荤
-                , "HMangerID": data[0].HMangerID
-                , "HSecManagerName": data[0].楠屾敹鍛�
-                , "HSecManagerID": data[0].HSecManagerID
-                , "HKeeperName": data[0].淇濈鍛�
-                , "HKeeperID": data[0].HKeeperID
-                , "HWHID": data[0].涓昏皟鍏ヤ粨搴揑D
-                , "HWHName": data[0].涓昏皟鍏ヤ粨搴�
-                , "HSCWHID": data[0].涓昏皟鍑轰粨搴揑D
-                , "HSCWHName": data[0].涓昏皟鍑轰粨搴�
-                , "HInnerBillNo": data[0].杈呭姪瀛楁
-                , "HRemark": data[0].琛ㄥご澶囨敞
-                , "HMaker": data[0].鍒跺崟浜�
-                , "HChecker": data[0].瀹℃牳浜�
-                , "HCloseMan": data[0].鍏抽棴浜�
-                , "HMakeDate": data[0].鍒跺崟鏃ユ湡
-                , "HCheckDate": data[0].瀹℃牳鏃ユ湡
-                , "HCloseDate": data[0].鍏抽棴鏃ユ湡
-                , "HUpDateDate": data[0].淇敼鏃ユ湡
-                , "HDeleteDate": data[0].浣滃簾鏃ユ湡
-            }
+              ...{
+                HBillNo: data[0].鍗曟嵁鍙�,
+                HDate: data[0].鏃ユ湡,
+                HDeptName: data[0].閮ㄩ棬,
+                HDeptID: data[0].HDeptID,
+                HSupID: data[0].HSupID,
+                HSupName: data[0].寰�鏉ュ崟浣�,
+                HEmpID: data[0].HEmpID,
+                HEmpName: data[0].涓氬姟鍛�,
+                HMangerName: data[0].涓荤,
+                HMangerID: data[0].HMangerID,
+                HSecManagerName: data[0].楠屾敹鍛�,
+                HSecManagerID: data[0].HSecManagerID,
+                HKeeperName: data[0].淇濈鍛�,
+                HKeeperID: data[0].HKeeperID,
+
+                HWHID: data[0].涓昏皟鍏ヤ粨搴揑D,
+                HWHName: data[0].涓昏皟鍏ヤ粨搴�,
+                HSCWHID: data[0].涓昏皟鍑轰粨搴揑D,
+                HSCWHName: data[0].涓昏皟鍑轰粨搴�,
+
+                HInnerBillNo: data[0].杈呭姪瀛楁,
+                HRemark: data[0].琛ㄥご澶囨敞,
+                HMaker: data[0].鍒跺崟浜�,
+                HChecker: data[0].瀹℃牳浜�,
+                HCloseMan: data[0].鍏抽棴浜�,
+                HMakeDate: data[0].鍒跺崟鏃ユ湡,
+                HCheckDate: data[0].瀹℃牳鏃ユ湡,
+                HCloseDate: data[0].鍏抽棴鏃ユ湡,
+                HUpDateDate: data[0].淇敼鏃ユ湡,
+                HDeleteDate: data[0].浣滃簾鏃ユ湡,
+                HSTOCKOUTORGID: data[0].HSTOCKOUTORGID.toString(),
+                HSTOCKINORGID: data[0].HSTOCKINORGID.toString(),
+              },
+            };
             //瀛愯〃
             var rowdata = [];
             for (let i = 0; i < data.length; i++) {
-              rowdata.push(
-                  {
-                    "HMaterID": data[i].HMaterID, "鐗╂枡浠g爜": data[i].鐗╂枡浠g爜, "鐗╂枡鍚嶇О": data[i].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": data[i].瑙勬牸鍨嬪彿,
-                    "HUnitID": data[i].HUnitID, "璁¢噺鍗曚綅": data[i].璁¢噺鍗曚綅, "HSecUnitRate": data[i].鎹㈢畻鐜�,
-                    "HSecUnitID": data[i].HSecUnitID, "杈呭姪璁¢噺鍗曚綅": data[i].杈呭姪璁¢噺鍗曚綅
-                    , "HQtyMust": data[i].搴旀敹鏁伴噺, "HQty": data[i].瀹炴敹鏁伴噺, "HRemark": data[i].琛ㄤ綋澶囨敞
-                    , "HPrice": data[i].鍗曚环, "HMoney": data[i].閲戦, "HOutPrice": data[i].璋冨嚭鍗曚环, "HOutMoney": data[i].璋冨嚭閲戦
-                    , "HWHID": data[i].HWHID, "璋冨叆浠撳簱": data[i].璋冨叆浠撳簱, "HSCWHID": data[i].HSCWHID, "璋冨嚭浠撳簱": data[i].璋冨嚭浠撳簱,
-                    "HBASEUNITID": data[i].HBASEUNITID, "鍩烘湰璁¢噺鍗曚綅": data[i].鍩烘湰璁¢噺鍗曚綅,
-                    "HEXTAUXUNITID": data[i].HEXTAUXUNITID, "杈呭崟浣�": data[i].杈呭崟浣�
-                  }
-              )
+              rowdata.push({
+                HMaterID: data[i].HMaterID,
+                鐗╂枡浠g爜: data[i].鐗╂枡浠g爜,
+                鐗╂枡鍚嶇О: data[i].鐗╂枡鍚嶇О,
+                瑙勬牸鍨嬪彿: data[i].瑙勬牸鍨嬪彿,
+                HUnitID: data[i].HUnitID,
+                璁¢噺鍗曚綅: data[i].璁¢噺鍗曚綅,
+                HSecUnitRate: data[i].鎹㈢畻鐜�,
+                HSecUnitID: data[i].HSecUnitID,
+                杈呭姪璁¢噺鍗曚綅: data[i].杈呭姪璁¢噺鍗曚綅,
+                HQtyMust: data[i].搴旀敹鏁伴噺,
+                HQty: data[i].瀹炴敹鏁伴噺,
+                HRemark: data[i].琛ㄤ綋澶囨敞,
+                HPrice: data[i].鍗曚环,
+                HMoney: data[i].閲戦,
+                HOutPrice: data[i].璋冨嚭鍗曚环,
+                HOutMoney: data[i].璋冨嚭閲戦,
+                HWHID: data[i].HWHID,
+                璋冨叆浠撳簱: data[i].璋冨叆浠撳簱,
+                HSCWHID: data[i].HSCWHID,
+                璋冨嚭浠撳簱: data[i].璋冨嚭浠撳簱,
+                HBASEUNITID: data[i].HBASEUNITID,
+                鍩烘湰璁¢噺鍗曚綅: data[i].鍩烘湰璁¢噺鍗曚綅,
+                HEXTAUXUNITID: data[i].HEXTAUXUNITID,
+                杈呭崟浣�: data[i].杈呭崟浣�,
+                HSTOCKORGID: data[i]["HSTOCKORGID"],
+                HOtherOrgID: data[i]["HSTOCKORGID"],
+                HAuxPropID: data[i]["HAuxPropID"],
+                杈呭姪灞炴��: data[i]["杈呭姪灞炴��"],
+              });
             }
-            this.editData = rowdata
+            this.editData = rowdata;
+
+            // 娓叉煋瀹屽悗鍐嶅弬涓庢槸鍚﹀鍒剁殑鍒ゆ柇
+            if (this.copyType == 1) {
+              this.getHBillNo();
+              let date = new Date();
+              this.form.HDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
+            }
+
+            this.formShow = true;
+            this.formLoading = false;
           }
-          this.formShow = true
-          this.formLoading = false
-        }
-      }).catch(error => {
-        console.log(error)
-        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-      });
+        })
+        .catch((error) => {
+          console.log(error);
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
     },
     /** 瀛愯〃鏄庣粏搴忓彿 */
     rowSysZbIndex({ row, rowIndex }) {
@@ -732,13 +1008,39 @@
         this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
       } else {
         let obj = {
-            "HMaterID": 0, "鐗╂枡浠g爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁¢噺鍗曚綅": "", "HSecUnitRate": "0",
-            "HSecUnitID": "0", "杈呭姪璁¢噺鍗曚綅": "", "HQtyMust": "0", "HQty": "0", "HPrice": "0", "HMoney": "0",
-            "HOutPrice": "0", "HOutMoney": "0", "HWHID": "0", "璋冨叆浠撳簱": "", "HSCWHID": "0", "璋冨嚭浠撳簱": "",
-            "HBASEUNITID": "0", "鍩烘湰璁¢噺鍗曚綅": "", "HEXTAUXUNITID": "0", "杈呭崟浣�": "","HRemark": ""}
+          HMaterID: 0,
+          鐗╂枡浠g爜: "",
+          鐗╂枡鍚嶇О: "",
+          瑙勬牸鍨嬪彿: "",
+          HUnitID: 0,
+          璁¢噺鍗曚綅: "",
+          HSecUnitRate: "0",
+          HSecUnitID: "0",
+          杈呭姪璁¢噺鍗曚綅: "",
+          HQtyMust: "0",
+          HQty: "0",
+          HPrice: "0",
+          HMoney: "0",
+          HOutPrice: "0",
+          HOutMoney: "0",
+          HWHID: "0",
+          璋冨叆浠撳簱: "",
+          HSCWHID: "0",
+          璋冨嚭浠撳簱: "",
+          HBASEUNITID: "0",
+          鍩烘湰璁¢噺鍗曚綅: "",
+          HEXTAUXUNITID: "0",
+          杈呭崟浣�: "",
+          HRemark: "",
+          HSTOCKORGID: sessionStorage["OrganizationID"],
+          HOtherOrgID: sessionStorage["OrganizationID"],
+          HSTOCKORGINID: this.form.HSTOCKINORGID,
+          HAuxPropID: 0,
+          杈呭姪灞炴��: "",
+        };
         if (index) {
           this.editData.splice(index, 0, obj);
-          this.$set(this.editData, index, obj)
+          this.$set(this.editData, index, obj);
         } else {
           this.editData.push(obj);
         }
@@ -746,20 +1048,21 @@
     },
     handleCopyZbRow() {
       if (!this.zbIndex) {
-        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�");
       } else {
-        let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+        let copyRow = JSON.parse(JSON.stringify(this.zbSelForm));
         this.editData.push(copyRow);
       }
     },
     handleMoveRowUp(zbSelForm) {
       if (!this.zbIndex) {
-        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�");
       } else {
         if (zbSelForm.index == 1) {
           this.$modal.msgError("绗竴琛屾暟鎹棤娉曚笂绉�");
-        } else { // 纭繚涓嶆槸绗竴琛�
-          let num = zbSelForm.index - 1
+        } else {
+          // 纭繚涓嶆槸绗竴琛�
+          let num = zbSelForm.index - 1;
           const record = this.editData.splice(num, 1)[0];
           this.editData.splice(num - 1, 0, record);
         }
@@ -767,12 +1070,13 @@
     },
     handleMoveRowDown(zbSelForm) {
       if (!this.zbIndex) {
-        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�");
       } else {
         if (zbSelForm.index == this.editData.length) {
           this.$modal.msgError("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉�");
-        } else { // 纭繚涓嶆槸绗竴琛�
-          let num = zbSelForm.index - 1
+        } else {
+          // 纭繚涓嶆槸绗竴琛�
+          let num = zbSelForm.index - 1;
           const record = this.editData.splice(num, 1)[0];
           this.editData.splice(num + 1, 0, record);
         }
@@ -780,129 +1084,146 @@
     },
     /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
     handleDeleteSysZb(row) {
-      this.checkedSysZb = []
-      this.checkedSysZb.push(row.index)
+      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
+          return checkedSysZb.indexOf(item.index) == -1;
         });
       }
     },
     /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
     handleTableZbEdit(selection) {
-      this.checkedSysZb = selection.map(item => item.index)
-      this.zbSelForm = selection[0]
-      this.zbIndex = this.checkedSysZb[0]
+      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) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+        const del_row = selection.shift();
+        this.$refs.zbTable.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
       }
     },
     // 缂栬緫鎻愪氦淇濆瓨
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
-          let fhck = false
-          if(this.editData.length == 0){
-              fhck = true
-              this.$modal.msgError("娌℃湁鐗╂枡鏄庣粏璁板綍锛�");
+          let fhck = false;
+          if (this.editData.length == 0) {
+            fhck = true;
+            this.$modal.msgError("娌℃湁鐗╂枡鏄庣粏璁板綍锛�");
           }
           this.editData.map((item, index) => {
             if (!item.HMaterID) {
-              fhck = true
+              fhck = true;
               this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
-            }else if(!item.HQty || item.HQty == 0){
-              fhck = true
+            } 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 == 3){
-                  this.form.HInterID = this.linterid
+              var Operation = null;
+              if (!this.OperationType) {
+                Operation = 1;
+              } else {
+                Operation = this.OperationType;
+                if (Operation == 3) {
+                  this.form.HInterID = this.linterid;
                 }
               }
               var sMainStr = JSON.stringify(this.form);
               var sSubStr = JSON.stringify(this.editData);
               var sAllStr = JSON.stringify(this.allVal);
-              var sMainSub = sMainStr + ';' + sSubStr + ';' + Operation + ";" + sessionStorage["HUserName"] + ";" + sAllStr;
+              var sMainSub =
+                sMainStr +
+                ";" +
+                sSubStr +
+                ";" +
+                Operation +
+                ";" +
+                sessionStorage["HUserName"] +
+                ";" +
+                sAllStr;
               axios({
-                method: 'post',
-                url: this.baseURL + "/Kf_MoveStockRequestBill/Kf_MoveStockRequestBillEdit",
+                method: "post",
+                url:
+                  this.$baseUrl + "/Kf_MoveStockRequestBill/Kf_MoveStockRequestBillEdit",
                 data: {
-                  'sMainSub': sMainSub
+                  sMainSub: sMainSub,
                 },
-              }).then(response => {
-                if (response.data.count == 1) {
-                  this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
-                  this.$modal.msgSuccess(response.data.Message);
-                  this.addBtnShow = true
-                  this.close()
-                } else {
-                  this.$modal.msgError(response.data.code + response.data.Message);
-                }
-              }).catch(error => {
-                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
-              });
+              })
+                .then((response) => {
+                  if (response.data.count == 1) {
+                    this.subDisabled = true; //璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+                    this.$modal.msgSuccess(response.data.Message);
+                    this.addBtnShow = true;
+                    this.close();
+                  } else {
+                    this.$modal.msgError(response.data.code + response.data.Message);
+                  }
+                })
+                .catch((error) => {
+                  this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+                });
             }
-          })
+          });
         }
       });
     },
     showReset() {
-      this.deptShow = false
-      this.warehouseShow = false
-      this.gyEmployeeShow = false
-      this.gySupplierShow = false
-      this.materialShow = false
+      this.deptShow = false;
+      this.warehouseShow = false;
+      this.gyEmployeeShow = false;
+      this.gySupplierShow = false;
+      this.materialShow = false;
+      this.propertyShow = false;
     },
     //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
     openDataDialog(num, row) {
       //num1閮ㄩ棬锛�2鍑哄簱浠撳簱锛�3鐗╂枡锛�4閿�鍞憳
       if (row) {
-        this.zbIndex = row.index - 1
+        this.zbIndex = row.index - 1;
       }
-      this.showReset()
+      this.showReset();
       if (num == 1) {
-        this.dialogTitle = '閮ㄩ棬鍒楄〃'
-        this.deptShow = true
-        this.openData = true
+        this.dialogTitle = "閮ㄩ棬鍒楄〃";
+        this.deptShow = true;
+        this.openData = true;
       } else if (num == 2) {
-        this.dialogTitle = '浠撳簱鍒楄〃'
-        this.warehouseShow = true
-        this.openData = true
-      }  else if (num == 3) {
-        this.dialogTitle = '鐗╂枡鍒楄〃'
-        this.materialShow = true
-        this.openData = true
+        this.dialogTitle = "浠撳簱鍒楄〃";
+        this.warehouseShow = true;
+        this.openData = true;
+      } else if (num == 3) {
+        this.dialogTitle = "鐗╂枡鍒楄〃";
+        this.materialShow = 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 = '淇濈鍛樺垪琛�'
+        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
+        this.gyEmployeeShow = true;
+        this.openData = true;
       } else if (num == 6) {
-        this.dialogTitle = '渚涘簲鍟嗗垪琛�'
-        this.gySupplierShow = true
-        this.openData = true
+        this.dialogTitle = "渚涘簲鍟嗗垪琛�";
+        this.gySupplierShow = true;
+        this.openData = true;
+      } else if (num == 7) {
+        this.dialogTitle = "杈呭姪灞炴�у垪琛�";
+        this.propertyShow = true;
+        this.openData = true;
       }
     },
-  }
+  },
 };
 </script>
 <style>

--
Gitblit v1.9.1