From 1d9fddc62fcbef1e88e924fc60adce48921edc6a Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期二, 31 三月 2026 20:22:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/logistics/transportGPS/WL_YayBill.vue | 57 +++++++++++++++----
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 87 ++++++++++++----------------
2 files changed, 82 insertions(+), 62 deletions(-)
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index cdb3ce8..6607205 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -920,7 +920,7 @@
var width = parseFloat(result.data[i].瀹瑰櫒瀹藉害) || 0;
var height = parseFloat(result.data[i].瀹瑰櫒楂樺害) || 0;
var rowVolume = (length * width * height).toFixed(2);
-
+ console.log(result.data)
this.editData.push(
{
"HSourceInterID": result.data[i].婧愬崟涓诲唴鐮�,
@@ -1261,6 +1261,10 @@
// 鏄剧ず婧愬崟鏁版嵁鍔犺浇鐘舵��
this.sourceDataLoading = true;
var dataArray = [];
+ let hmainidVal = []
+ for (var i = 0; i < checkStatus.length; i++) {
+ hmainidVal[i] = "'" + checkStatus[i].hmainid + '-' + checkStatus[i].hsubid + "'"
+ }
// 浣跨敤Promise.all绛夊緟鎵�鏈夊紓姝ヨ姹傚畬鎴�
const promises = checkStatus.map(async (item) => {
const temp = await this.getPushSeOutStockBillInit(item.hmainid, item.hsubid);
@@ -1281,41 +1285,37 @@
var existingData = this.editData || [];
var orginHQTY = 0;
// 鍒涘缓鐗╂枡ID鏄犲皠
- var materialMap = {};
- for (var i = 0; i < dataArray.length; i++) {
- orginHQTY = dataArray[i].鏁伴噺;
- var materialId = dataArray[i].HMaterID;
- console.log(materialId)
- if (!materialMap[materialId]) {
- materialMap[materialId] = [];
- }
- materialMap[materialId].push({
- HMaterID: dataArray[i].HMaterID,
- hmainid: dataArray[i].hmainid,
- hsubid: dataArray[i].hsubid,
- 鍗曟嵁鍙�: dataArray[i].鍗曟嵁鍙�
- });
- }
- // 鑾峰彇鎵�鏈夌墿鏂橧D
- var ListMaterial = "";
- for (var materialId in materialMap) {
- if (ListMaterial) ListMaterial += ";";
- ListMaterial += materialId;
- }
- if (!ListMaterial) {
- this.$modal.msgError("娌℃湁鎵惧埌鐗╂枡淇℃伅锛岃妫�鏌ラ�夋嫨鐨勬簮鍗曟槸鍚﹀寘鍚湁鏁堢殑鐗╂枡鏁版嵁!");
- this.sourceDataLoading = false;
- return;
- }
- let hmainidVal = []
- for (var i = 0; i < dataArray.length; i++) {
- hmainidVal[i] = dataArray[i].hmainid
- }
- // const response = await axios.get(this.baseURL + '/WLYayBillController/GetMesByOrginBill_1', {
+ // var materialMap = {};
+ // for (var i = 0; i < dataArray.length; i++) {
+ // orginHQTY = dataArray[i].鏁伴噺;
+ // var materialId = dataArray[i].HMaterID;
+ // console.log(materialId)
+ // if (!materialMap[materialId]) {
+ // materialMap[materialId] = [];
+ // }
+ // materialMap[materialId].push({
+ // HMaterID: dataArray[i].HMaterID,
+ // hmainid: dataArray[i].hmainid,
+ // hsubid: dataArray[i].hsubid,
+ // 鍗曟嵁鍙�: dataArray[i].鍗曟嵁鍙�
+ // });
+ // }
+ // // 鑾峰彇鎵�鏈夌墿鏂橧D
+ // var ListMaterial = "";
+ // for (var materialId in materialMap) {
+ // if (ListMaterial) ListMaterial += ";";
+ // ListMaterial += materialId;
+ // }
+ // if (!ListMaterial) {
+ // this.$modal.msgError("娌℃湁鎵惧埌鐗╂枡淇℃伅锛岃妫�鏌ラ�夋嫨鐨勬簮鍗曟槸鍚﹀寘鍚湁鏁堢殑鐗╂枡鏁版嵁!");
+ // this.sourceDataLoading = false;
+ // return;
+ // }
+
const response = await axios.get(this.baseURL + '/WLYayBillController/GetList', {
params: {
"user": sessionStorage["HUserName"],
- "hmainid": hmainidVal.join(',')
+ "hmainid_hsubid": hmainidVal.join(',')
},
});
console.log('婧愬崟璇︽儏', response.data.data)
@@ -1323,18 +1323,7 @@
if (result.count == 1) {
let res = result.data;
var newRows = [];
- // 涓烘瘡涓簮鍗曡鍒涘缓瀵瑰簲鐨勫瓙琛ㄨ
- // for (var materialId in materialMap) {
- // var sourceInfos = materialMap[materialId];
- // // 鏌ユ壘璇ョ墿鏂橧D瀵瑰簲鐨勫寘瑁呭鍣ㄤ俊鎭�
- // var materialInfo = null;
- // for (var i = 0; i < res.length; i++) {
- // if (res[i].HMaterID == materialId) {
- // materialInfo = res[i];
- // break;
- // }
- // }
- // if (materialInfo) {
+
// 涓烘瘡涓簮鍗曡鍒涘缓涓�鏉¤褰�
for (var j = 0; j < res.length; j++) {
var sourceInfo = res[j];
@@ -1352,7 +1341,7 @@
continue;
}
// 璁＄畻鐩稿叧鏁伴噺
- var qty = orginHQTY || 0;
+ var qty = res[j].鐗╂枡鏁伴噺 || 0;
var snp = res[j].鎵樻爣鍑嗗鍣ㄦ暟閲� || 0;
var mouldQty = 0;
if (snp > 0) {
@@ -1377,12 +1366,12 @@
"HUnitID": res[j].HUnitID,
"HMouldID": res[j].HMouldID,
"HPackV": res[j].鎵樹綋绉�,
- "HStandardQtyForMouldInPack": res[j].鎵樻暟閲�,
+ "HStandardQtyForMouldInPack": res[j].瀹瑰櫒鏁伴噺,
"HMouldLength": res[j].闀垮害,
"HMouldWidth": res[j].瀹藉害,
"HMouldHeight": res[j].楂樺害,
"HMouldFoldHeight": res[j].鎶樺彔楂樺害,
- "HQty": orginHQTY,
+ "HQty": res[j].鐗╂枡鏁伴噺,
"HQty_origin": orginHQTY,
"HMouldQty": mouldQty,
"HVolume": rowVolume,
@@ -1392,8 +1381,6 @@
});
this.form.HTotalVolume = this.form.HTotalVolume * 1 + rowVolume * 1
}
- // }
- // }
if (newRows.length === 0) {
this.$modal.msgError("娌℃湁鍙坊鍔犵殑鏂拌褰曪紝鍙兘鏄簮鍗曟暟鎹凡瀛樺湪鎴栫墿鏂欎俊鎭笉瀹屾暣!");
this.sourceDataLoading = false;
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 8f0c5d6..df1aba6 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -221,14 +221,14 @@
<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-col :span="1.5">
<el-button type="primary" icon="el-icon-upload" size="mini" :disabled="single"
@click="handleFileUpload">闄勪欢涓婁紶</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" :disabled="multiple"
@click="handleBatchFileDownload">闄勪欢涓嬭浇</el-button>
- </el-col>
+ </el-col> -->
</el-row>
<div class="tableBox" v-loading="loading">
<el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
@@ -337,8 +337,8 @@
<el-input v-model="fileUploadForm.billNo" disabled />
</el-form-item>
<el-form-item label="闄勪欢">
- <el-upload class="upload-demo" ref="fileUpload" action="" :on-preview="handleFilePreview"
- :on-remove="handleFileRemove" :on-change="handleFileChange" :file-list="fileList"
+ <el-upload class="upload-demo" ref="fileUpload" :action="upload.url + '?updateSupport=' + upload.updateSupport" :on-preview="handleFilePreview"
+ :on-remove="handleFileRemove" :on-change="handleFileChange" :file-list="fileList" :on-success="handleFileSuccess" :on-error="handleFileError"
:auto-upload="false" :limit="10" :on-exceed="handleFileExceed"
accept=".jpg,.png,.jpeg,.pdf,.doc,.docx,.xls,.xlsx,.zip,.rar">
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
@@ -368,7 +368,8 @@
<!-- 闄勪欢鎵归噺涓嬭浇 -->
<el-dialog title="闄勪欢鎵归噺涓嬭浇" :visible.sync="openBatchDownload" width="900px" append-to-body>
<div style="margin-bottom: 10px;">
- <el-alert :title="`宸查�夋嫨 ${selectedBillCount} 鏉″崟鎹紝鍏� ${batchFileList.length} 涓檮浠禶" type="info" show-icon :closable="false" />
+ <el-alert :title="`宸查�夋嫨 ${selectedBillCount} 鏉″崟鎹紝鍏� ${batchFileList.length} 涓檮浠禶" type="info"
+ show-icon :closable="false" />
</div>
<el-table :data="batchFileList" border v-loading="batchDownloadLoading" max-height="400"
@selection-change="handleBatchFileSelectionChange">
@@ -384,7 +385,8 @@
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="batchDownloadFiles" :loading="batchDownloadLoading" :disabled="selectedBatchFiles.length === 0">鎵归噺涓嬭浇閫変腑</el-button>
+ <el-button type="primary" @click="batchDownloadFiles" :loading="batchDownloadLoading"
+ :disabled="selectedBatchFiles.length === 0">鎵归噺涓嬭浇閫変腑</el-button>
<el-button type="primary" @click="downloadAllFiles" :loading="batchDownloadLoading">涓嬭浇鍏ㄩ儴</el-button>
<el-button @click="openBatchDownload = false">鍏� 闂�</el-button>
</div>
@@ -409,8 +411,21 @@
components: { BarCodeDetail, PackStockDetail, Edit, RowSettings, PrintList, PayMentOtherBillTranEdit, GyCar, GyDriver },
data() {
return {
+ upload: {
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁绂佺敤涓婁紶
+ isUploading: false,
+ // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
+ updateSupport: 0,
+ // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+ // headers: { Authorization: "Bearer " + getToken() },
+ // 涓婁紶鐨勫湴鍧�
+ url: 'http://220.189.218.155:9010/File'
+ },
baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
-
HModName: "Cg_ContractTransportBillMainList",
HBillType: "WL_YayBill",
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
@@ -1467,7 +1482,14 @@
handleFileRemove(file, fileList) {
this.uploadFiles = fileList
},
+ handleFileSuccess(response, file, fileList){
+ console.log(file)
+ },
+ handleFileError(response, file, fileList){
+ console.log(response, file, fileList)
+ },
handleFilePreview(file) {
+
if (file.url) {
window.open(file.url, '_blank')
} else if (file.raw) {
@@ -1485,23 +1507,34 @@
this.$modal.msgWarning('璇峰厛閫夋嫨瑕佷笂浼犵殑鏂囦欢')
return
}
+ console.log(this.uploadFiles)
this.fileUploadLoading = true
const formData = new FormData()
this.uploadFiles.forEach(file => {
formData.append('files', file.raw)
})
+
// formData.append('HBillNo', this.fileUploadForm.billNo)
formData.append('HInterID', this.fileUploadForm.hInterID)
formData.append('HUserName', sessionStorage["HUserName"] || '')
- axios.get(this.$baseUrl + '/WLYayBillController/saveFileAddress', formData, {
+ // axios.get(this.$baseUrl + '/WLYayBillController/saveFileAddress', formData, {
+ // headers: {
+ // 'Content-Type': 'multipart/form-data'
+ // },
+ // params:{
+ // HInterID:this.fileUploadForm.hInterID,
+ // HFileAddress:this.fileUploadPath + '/' + this.uploadFiles[0].name,
+ // CurUserName:sessionStorage["HUserName"]
+ // }
+ // })
+ axios('', {
headers: {
'Content-Type': 'multipart/form-data'
},
- params:{
- HInterID:this.fileUploadForm.hInterID,
- CurUserName:sessionStorage["HUserName"]
- }
+ methods: 'post',
+ data: formData
}).then(response => {
+ console.log(response)
this.fileUploadLoading = false
if (response.data.code == 1) {
this.$modal.msgSuccess(response.data.Message || '鏂囦欢涓婁紶鎴愬姛')
--
Gitblit v1.9.1