From 2e900e70382ed06f5bb0fb0d7d08ebb26e786306 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期三, 28 一月 2026 16:31:04 +0800
Subject: [PATCH] 出运单修改

---
 src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue |   19 ++-
 src/views/logistics/transportGPS/WL_YayBill.vue                    |   11 --
 src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue           |  263 +++++++++++++++++++++++++--------------------------
 3 files changed, 140 insertions(+), 153 deletions(-)

diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 7bdf247..1c369ba 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -21,7 +21,7 @@
                             <el-col :span="6">
                                 <el-form-item label="鏃ユ湡" prop="HDate">
                                     <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡"
-                                        value-format="yyyy-MM-dd" disabled> </el-date-picker>
+                                        format="yyyy-MM-dd" disabled> </el-date-picker>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="6">
@@ -177,36 +177,20 @@
                             <el-col :span="6">
                                 <el-form-item label="瑕佹眰鎻愯揣鏃ユ湡" prop="HDateForRequestedPick">
                                     <el-date-picker v-model="form.HDateForRequestedPick" type="date"
-                                        placeholder="閫夋嫨瑕佹眰鎻愯揣鏃ユ湡" value-format="yyyy-MM-dd">
+                                        placeholder="閫夋嫨瑕佹眰鎻愯揣鏃ユ湡" format="yyyy-MM-dd hh:mm:ss">
                                     </el-date-picker>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="6">
                                 <el-form-item label="鎵胯繍鍟嗙‘璁ゆ棩鏈�" prop="HDate_CarrierSure">
                                     <el-date-picker v-model="form.HDate_CarrierSure" type="date" placeholder="閫夋嫨鎵胯繍鍟嗙‘璁ゆ棩鏈�"
-                                        value-format="yyyy-MM-dd">
+                                        format="yyyy-MM-dd hh:mm:ss" disabled>
                                     </el-date-picker>
                                 </el-form-item>
                             </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="鍒嗛厤鍙告満鏃ユ湡" prop="HDate_AllocationDriver">
-                                    <el-date-picker v-model="form.HDate_AllocationDriver" type="date"
-                                        placeholder="閫夋嫨鍒嗛厤鍙告満鏃ユ湡" value-format="yyyy-MM-dd">
-                                    </el-date-picker>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="瑕佹眰鍒拌揪鏃ユ湡" prop="HDataForRequestedArrived">
-                                    <el-date-picker v-model="form.HDataForRequestedArrived" type="date"
-                                        placeholder="閫夋嫨瑕佹眰鍒拌揪鏃ユ湡" value-format="yyyy-MM-dd">
-                                    </el-date-picker>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                        <el-row>
                             <el-col :span="6">
                                 <el-form-item label="鐗╂祦鐘舵��" prop="HCarryStatus">
-                                    <el-select v-model="form.HCarryStatus" placeholder="璇烽�夋嫨鐗╂祦鐘舵��">
+                                    <el-select v-model="form.HCarryStatus" placeholder="璇烽�夋嫨鐗╂祦鐘舵��" disabled>
                                         <el-option label="鐢宠涓�" value="1"></el-option>
                                         <el-option label="宸插鏍�" value="2"></el-option>
                                         <el-option label="鎵胯繍鍟嗙‘璁�" value="3"></el-option>
@@ -219,9 +203,27 @@
                                     </el-select>
                                 </el-form-item>
                             </el-col>
+                        </el-row>
+                    </el-tab-pane>
+                    <el-tab-pane label="鎵胯繍鍟嗕俊鎭�" name="second">
+                        <el-row>
+                            <el-col :span="6">
+                                <el-form-item label="鍒嗛厤鍙告満鏃ユ湡" prop="HDate_AllocationDriver">
+                                    <el-date-picker v-model="form.HDate_AllocationDriver" type="date"
+                                        placeholder="閫夋嫨鍒嗛厤鍙告満鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="瑕佹眰鍒拌揪鏃ユ湡" prop="HDataForRequestedArrived">
+                                    <el-date-picker v-model="form.HDataForRequestedArrived" type="date"
+                                        placeholder="閫夋嫨瑕佹眰鍒拌揪鏃ユ湡" format="yyyy-MM-dd hh:mm:ss">
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
                             <el-col :span="6">
                                 <el-form-item label="杞﹁締" prop="HCarName">
-                                    <el-input v-model="form.HCarName" placeholder="璇疯緭鍏ヨ溅杈�">
+                                    <el-input v-model="form.HCarName" placeholder="璇疯緭鍏ヨ溅杈�" disabled>
                                         <el-button slot="append" icon="el-icon-search"
                                             @click="openDataDialog(14)"></el-button>
                                     </el-input>
@@ -229,52 +231,80 @@
                             </el-col>
                             <el-col :span="6">
                                 <el-form-item label="鍙告満" prop="HDriverName">
-                                    <el-input v-model="form.HDriverName" placeholder="璇疯緭鍏ュ徃鏈�">
+                                    <el-input v-model="form.HDriverName" placeholder="璇疯緭鍏ュ徃鏈�" disabled>
                                         <el-button slot="append" icon="el-icon-search"
                                             @click="openDataDialog(15)"></el-button>
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                         </el-row>
+                        <el-row>
+                            <el-col :span="6">
+                                <el-form-item label="鍒板巶纭浜�" prop="HSurer_Arrive">
+                                    <el-input v-model="form.HSurer_Arrive" placeholder="璇疯緭鍏ュ埌鍘傜‘璁や汉" disabled />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="鍒板巶纭鏃堕棿" prop="HDate_Arrive">
+                                    <el-date-picker v-model="form.HDate_Arrive" type="date" format="yyyy-MM-dd HH:mm:ss"
+                                        placeholder="閫夋嫨鍒板巶纭鏃堕棿" disabled>
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="鎻愯揣纭浜�" prop="HSurer_Pick">
+                                    <el-input v-model="form.HSurer_Pick" placeholder="璇疯緭鍏ユ彁璐х‘璁�" disabled />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="鎻愯揣纭鏃堕棿" prop="HDate_Pick">
+                                    <el-date-picker v-model="form.HDate_Pick" type="date" format="yyyy-MM-dd hh:mm:ss"
+                                        placeholder="閫夋嫨鎻愯揣纭鏃堕棿" disabled>
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="6">
+                                <el-form-item label="鍑哄巶杩愯緭纭浜�" prop="HSurer_Trans">
+                                    <el-input v-model="form.HSurer_Trans" placeholder="璇疯緭鍏ュ埌鍘傜‘璁や汉" disabled />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="鍑哄巶杩愯緭纭鏃堕棿" prop="HDate_Trans">
+                                    <el-date-picker v-model="form.HDate_Trans" type="date" format="yyyy-MM-dd hh:mm:ss"
+                                        placeholder="閫夋嫨鍒板嚭鍘傝繍杈撶‘璁ゆ椂闂�" disabled>
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="绛炬敹纭浜�" prop="HSurer_Receive">
+                                    <el-input v-model="form.HSurer_Receive" placeholder="璇疯緭鍏ョ鏀剁‘璁や汉" disabled />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="绛炬敹纭鏃堕棿" prop="HDate_Receive">
+                                    <el-date-picker v-model="form.HDate_Receive" type="date"
+                                        format="yyyy-MM-dd hh:mm:ss" placeholder="閫夋嫨绛炬敹纭鏃堕棿" disabled>
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="6">
+                                <el-form-item label="鏍哥畻浜�" prop="HSurer_Accounting">
+                                    <el-input v-model="form.HSurer_Accounting" placeholder="璇疯緭鍏ユ牳绠椾汉" disabled />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="6">
+                                <el-form-item label="鏍哥畻鏃堕棿" prop="HDate_Accounting">
+                                    <el-date-picker v-model="form.HDate_Accounting" type="date"
+                                        format="yyyy-MM-dd hh:mm:ss" placeholder="閫夋嫨鏍哥畻鏃堕棿" disabled>
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
                     </el-tab-pane>
-                    <!-- <el-tab-pane label="闄勪欢淇℃伅" name="second">
-                        <div style="padding: 10px;">
-                            <el-upload class="upload-demo" ref="upload" action="" :on-change="handleFileChange"
-                                :show-file-list="false" :on-remove="handleFileRemove" :file-list="uploadFiles"
-                                :auto-upload="false" multiple>
-                                <el-button slot="trigger" size="small" type="primary">閫夋嫨鏂囦欢</el-button>
-                                <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload"
-                                    :loading="uploadLoading">涓婁紶鏂囦欢</el-button>
-                            </el-upload>
-                            <el-table :data="uploadFiles" style="width: 100%" border>
-                                <el-table-column prop="name" label="鏂囦欢鍚�">
-                                </el-table-column>
-                                <el-table-column prop="type" label="鏂囦欢绫诲瀷">
-                                    <template slot-scope="scope">
-                                        {{ scope.row.name.substring(scope.row.name.lastIndexOf('.') + 1).toLowerCase()
-                                        }}
-                                    </template>
-</el-table-column>
-<el-table-column prop="size" label="澶у皬">
-    <template slot-scope="scope">
-                                        {{ (scope.row.size / 1024).toFixed(1) + ' KB' }}
-                                    </template>
-</el-table-column>
-<el-table-column prop="status" label="鐘舵��">
-    <template slot-scope="scope">
-                                        <span v-if="scope.row.status == 'ready'">鏈笂浼�</span>
-                                    </template>
-</el-table-column>
-<el-table-column label="鎿嶄綔" width="180">
-    <template slot-scope="scope">
-                                        <el-button size="mini" type="primary"
-                                            @click="flieUpload(scope.row)">涓婁紶</el-button>
-                                        <el-button size="mini" type="danger" @click="deleteFile(index)">鍒犻櫎</el-button>
-                                    </template>
-</el-table-column>
-</el-table>
-</div>
-</el-tab-pane> -->
                     <el-tab-pane label="鍒跺崟淇℃伅" name="third">
                         <el-row>
                             <el-col :span="6">
@@ -340,72 +370,7 @@
                                 </el-form-item>
                             </el-col>
                         </el-row>
-                        <el-row>
-                            <el-col :span="6">
-                                <el-form-item label="鍒板巶纭浜�" prop="HSurer_Arrive">
-                                    <el-input v-model="form.HSurer_Arrive" placeholder="璇疯緭鍏ュ埌鍘傜‘璁や汉" disabled />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="鍒板巶纭鏃堕棿" prop="HDate_Arrive">
-                                    <el-date-picker v-model="form.HDate_Arrive" type="date" placeholder="閫夋嫨鍒板巶纭鏃堕棿"
-                                        disabled>
-                                    </el-date-picker>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="鎻愯揣纭浜�" prop="HSurer_Pick">
-                                    <el-input v-model="form.HSurer_Pick" placeholder="璇疯緭鍏ユ彁璐х‘璁�" disabled />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="鎻愯揣纭鏃堕棿" prop="HDate_Pick">
-                                    <el-date-picker v-model="form.HDate_Pick" 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="HSurer_Trans">
-                                    <el-input v-model="form.HSurer_Trans" placeholder="璇疯緭鍏ュ埌鍘傜‘璁や汉" disabled />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="鍑哄巶杩愯緭纭鏃堕棿" prop="HDate_Trans">
-                                    <el-date-picker v-model="form.HDate_Trans" type="date" placeholder="閫夋嫨鍒板嚭鍘傝繍杈撶‘璁ゆ椂闂�"
-                                        disabled>
-                                    </el-date-picker>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="绛炬敹纭浜�" prop="HSurer_Receive">
-                                    <el-input v-model="form.HSurer_Receive" placeholder="璇疯緭鍏ョ鏀剁‘璁や汉" disabled />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="绛炬敹纭鏃堕棿" prop="HDate_Receive">
-                                    <el-date-picker v-model="form.HDate_Receive" 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="HSurer_Accounting">
-                                    <el-input v-model="form.HSurer_Accounting" placeholder="璇疯緭鍏ユ牳绠椾汉" disabled />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="6">
-                                <el-form-item label="鏍哥畻鏃堕棿" prop="HDate_Accounting">
-                                    <el-date-picker v-model="form.HDate_Accounting" type="date" placeholder="閫夋嫨鏍哥畻鏃堕棿"
-                                        disabled>
-                                    </el-date-picker>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
+
                     </el-tab-pane>
                 </el-tabs>
                 <el-card class="box-card">
@@ -470,7 +435,11 @@
                                 </template>
                             </el-table-column>
                             <el-table-column align="center" label="鍖呰瀹瑰櫒鏁伴噺" width="120">
-                                <template slot-scope="scope">{{ scope.row.HMouldQty }}</template>
+                                <template slot-scope="scope">
+                                    <el-input-number v-model="scope.row.HMouldQty" :min="0" style="width: 90px;"
+                                        controls-position="right"
+                                        @change="changeHMouldQty(scope.row)"></el-input-number>
+                                </template>
                             </el-table-column>
                             <el-table-column align="center" label="鐗╂枡鏁伴噺" width="120">
                                 <template slot-scope="scope">
@@ -485,9 +454,9 @@
                                 </template>
                             </el-table-column>
                             <el-table-column align="center" label="闆跺崟鍗犵敤浣撶Н" width="120">
-                                <template slot-scope="scope">
-                                    <el-input-number v-model="scope.row.HScatteredVolume" :min="0" style="width: 90px;"
-                                        controls-position="right"></el-input-number>
+                                <template slot-scope="scope">{{ scope.row.HScatteredVolume }}
+                                    <!-- <el-input-number v-model="scope.row.HScatteredVolume" :min="0" style="width: 90px;"
+                                        controls-position="right"></el-input-number> -->
                                 </template>
                             </el-table-column>
                             <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
@@ -1063,12 +1032,14 @@
                 this.gyDriverShow = false
                 this.openData = false
             } else if (num == 16) {
+                console.log(deptRow)
                 this.form.HContractTransportBillNo = deptRow.鍗曟嵁鍙�
                 this.form.HContractTransportInterID = deptRow.HInterID
                 this.form.HContractTransportEntryID = deptRow.HInterID
                 this.form.HDistance = deptRow.璺濈
                 this.form.HTransportTimes = deptRow.杩愯緭鏃舵晥
                 this.form.HTransportTyep = deptRow.杩愯緭绫诲瀷
+                this.form.HTransType = deptRow.杩愯緭绫诲瀷
                 this.form.HSSID = deptRow.缁撶畻鏂瑰紡
                 this.form.HSSName = deptRow.缁撶畻鏂瑰紡鍚嶇О
                 this.form.HCurID = deptRow.甯佸埆
@@ -1089,7 +1060,7 @@
                 this.editData[this.zbIndex].HMouldHeight = deptRow.楂樺害
                 this.editData[this.zbIndex].HMouldFoldHeight = deptRow.鎶樺彔楂樺害
                 this.editData[this.zbIndex].HSNP = deptRow.瀹瑰櫒鍖呰浜у搧鏁伴噺
-                this.editData[this.zbIndex].HVolume = (this.editData[this.zbIndex].HMouldLength * this.editData[this.zbIndex].HMouldWidth * this.editData[this.zbIndex].HMouldHeight).toFixed(2) - 0
+                this.editData[this.zbIndex].HVolume = (this.editData[this.zbIndex].HMouldLength * this.editData[this.zbIndex].HMouldWidth * this.editData[this.zbIndex].HMouldHeight*this.editData[this.zbIndex].HMouldQty).toFixed(2) - 0
                 this.form.HTotalVolume = 0
                 this.editData.map(item => {
                     this.form.HTotalVolume = item.HVolume + this.form.HTotalVolume
@@ -1161,6 +1132,9 @@
                 this.form.HMainSourceEntryID = deptRow[0]["hsubid"]
                 this.form.HMainSourceBillType = deptRow[0]["HBillType"]
                 this.form.HMainSourceBillNo = deptRow[0]["鍗曟嵁鍙�"]
+                this.form.HCurName = deptRow[0]["甯佸埆"]
+                this.form.HCurID = deptRow[0]["HCurID"]
+                this.form.HExRate = deptRow[0]["姹囩巼"]
                 // 妫�鏌ユ槸鍚︽墍鏈夎褰曞睘浜庡悓涓�瀹㈡埛
                 for (var i = 0; i < deptRow.length; i++) {
                     if (deptRow[i]["HCusID"] != this.form.HCusID) {
@@ -1518,6 +1492,12 @@
                 this.editData = editData.filter(function (item) {
                     return checkedSysZb.indexOf(item.index) == -1
                 });
+                this.form.HTotalVolume = 0
+                if (this.editData.length > 0) {
+                    this.editData.map(item => {
+                        this.form.HTotalVolume = item.HVolume + this.form.HTotalVolume
+                    })
+                }
             }
         },
         //#endregion
@@ -1665,7 +1645,17 @@
             });
         },
         //#endregion
-
+        // 鍖呰瀹瑰櫒鏁伴噺璁$畻浣撶Н
+        changeHMouldQty(row) {
+            this.zbIndex = row.index - 1
+            this.editData[this.zbIndex].HVolume = (this.editData[this.zbIndex].HMouldLength * this.editData[this.zbIndex].HMouldWidth * this.editData[this.zbIndex].HMouldHeight*this.editData[this.zbIndex].HMouldQty).toFixed(2) - 0
+            this.form.HTotalVolume = 0
+            this.editData.map(item => {
+                this.form.HTotalVolume = item.HVolume + this.form.HTotalVolume
+            })
+            this.calculateLoadingRate(parseFloat(this.form.HTotalVolume || 0));
+        },
+        //#endregion
         // 璁$畻瑁呰浇鐜囧嚱鏁�
         calculateLoadingRate(totalVolume) {
             var maxVolume = parseFloat(this.form.HCarTypeMaxVolume) || 0;
@@ -1728,17 +1718,22 @@
                 }
             }
             if (exceedSources.length > 0) {
+                let num = null
                 var message = '鐗╂枡鏁伴噺涔嬪拰瓒呰繃婧愬崟鏁伴噺锛�';
                 exceedSources.forEach(function (item, index) {
+                    num = item.sourceQty
                     message += (index + 1) + '. 婧愬崟鍙凤細' + item.sourceBillNo +
                         '锛屾簮鍗曟暟閲忥細' + item.sourceQty +
                         '锛屽綋鍓嶆暟閲忥細' + item.currentTotal;
+                    
                 });
-
+                this.$nextTick(()=>{
+                    this.editData[selRow.index - 1].HQty = num
+                })
                 this.$modal.msgError(message);
                 return true; // 琛ㄧず鏈夎秴鍑�
             }
-            this.editData[selRow.index-1].HMouldQty = Math.ceil(selRow.HQty / this.editData[selRow.index-1].HSNP)
+            this.editData[selRow.index - 1].HMouldQty = Math.ceil(selRow.HQty / this.editData[selRow.index - 1].HSNP)
             return false; // 琛ㄧず娌℃湁瓒呭嚭
         },
         //#region 闄勪欢涓婁紶鐩稿叧鏂规硶
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index d0de9e1..3d111b3 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -1255,17 +1255,6 @@
                 this.$modal.msgError("鑾峰彇婧愬崟鏁版嵁鏃跺彂鐢熼敊璇紝璇风◢鍚庨噸璇�!");
             }
         },
-        // dbEmitData(deptRow, num) {
-        //     if (num == 14) {
-
-        //         this.gyCarShow = false
-        //         this.openData = false
-        //     } else if (num == 15) {
-        //         this.gyDriverShow = false
-        //         this.openData = false
-        //     }
-        //     this.openData = false
-        // },
         //#endregion
         //#region 寮圭獥鏁版嵁鍗曞嚮浜嬩欢
         emitData(deptRow, num) {
diff --git a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
index 485caa3..cff47b0 100644
--- a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
+++ b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
@@ -179,7 +179,7 @@
                             <div :style="item.style">
                                 <span v-if="column.property.includes('鏃ユ湡')">{{
                                     parseTime(row[column.property], "{y}-{m}-{d}")
-                                }}</span>
+                                    }}</span>
                                 <el-button type="text" @click="handleEdit(row, (OperationType = 3))"
                                     v-else-if="column.property == '鍗曟嵁鍙�'">{{ row.鍗曟嵁鍙� }}</el-button>
                                 <span v-else>{{ row[column.label] }}</span>
@@ -217,7 +217,7 @@
     components: { RowSettings, Edit, PrintList, BarCodeDetail },
     props: {
         openPage: { type: String, },
-        propHMaterID: { },
+        propHMaterID: {},
         propHOrgID: {},
     },
     data() {
@@ -394,11 +394,14 @@
             if (this.pageSize == 0) {
                 this.pageSize = 50;
             }
-             if (this.propHOrgID) {
+            if (this.propHOrgID) {
                 this.sWhere += " and HOrgID like '%" + this.propHOrgID + "%'";
             }
             if (this.propHMaterID) {
                 this.sWhere += " and HMaterID like '%" + this.propHMaterID + "%'";
+            }
+              if (this.openPage) {
+                this.sWhere += " and HUseFlag == 1 and HSendPackFlag == 'Y' and ISNULL(瀹℃牳浜�,'')  != ''"
             }
             // 鍒楄〃
             axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/Gy_MaterialPackingRelationList", {
@@ -783,22 +786,22 @@
                 this.sWhere += " and 鐗╂枡浠g爜 like '%" + this.queryParams.MaterialCode + "%'";
             }
             if (this.queryParams.MaterialName) {
-                this.sWhere += " and 鐗╂枡鍚嶇О like '%" +  this.queryParams.MaterialName + "%'";
+                this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.MaterialName + "%'";
             }
             if (this.queryParams.SpecificationModel) {
-                this.sWhere += " and 瑙勬牸鍨嬪彿 like '%" +  this.queryParams.SpecificationModel + "%'";
+                this.sWhere += " and 瑙勬牸鍨嬪彿 like '%" + this.queryParams.SpecificationModel + "%'";
             }
             if (this.queryParams.HSourceBillNo) {
-                this.sWhere += " and 婧愬崟鍗曞彿 like '%" +  this.queryParams.HSourceBillNo + "%'";
+                this.sWhere += " and 婧愬崟鍗曞彿 like '%" + this.queryParams.HSourceBillNo + "%'";
             }
             if (this.queryParams.Warehouse) {
                 this.sWhere += " and 鍙戣揣浠撳簱 like '%" + this.queryParams.Warehouse + "%'";
             }
             if (this.queryParams.Hmaker) {
-                this.sWhere += " and 鍒跺崟浜� like '%" +  this.queryParams.Hmaker + "%'";
+                this.sWhere += " and 鍒跺崟浜� like '%" + this.queryParams.Hmaker + "%'";
             }
             if (this.queryParams.HUSEORGID) {
-                this.sWhere += " and HOrgID like '%" +  this.queryParams.HUSEORGID + "%'";
+                this.sWhere += " and HOrgID like '%" + this.queryParams.HUSEORGID + "%'";
             }
             this.getList();
         },

--
Gitblit v1.9.1