From 2b68e9f78a66afbb31ed1c93d9e1f13bdf2447e7 Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期四, 15 一月 2026 09:26:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/basicModeling/Gy_MouldFile.vue | 4
.env.development | 4
src/views/basic/gyUnit/gyUnit.vue | 17 +++--
.env.production | 5 +
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 96 +++++++++++++++++++++++++++-----
5 files changed, 97 insertions(+), 29 deletions(-)
diff --git a/.env.development b/.env.development
index 8d8d39f..60f3665 100644
--- a/.env.development
+++ b/.env.development
@@ -5,8 +5,8 @@
ENV = 'development'
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
-# VUE_APP_BASE_API = 'http://localhost:81/API/'
-VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+VUE_APP_BASE_API = http://localhost:81/API/
+# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
# VUE_APP_BASE_API = 'http://192.168.1.11/API/'
diff --git a/.env.production b/.env.production
index 6a5d6c3..6321c0e 100644
--- a/.env.production
+++ b/.env.production
@@ -6,11 +6,12 @@
# 瀹佹尝 鍥涚淮灏�
# VUE_APP_BASE_API = http://192.168.0.236:9010/API/
-# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
+VUE_APP_BASE_API = http://220.189.218.155:9010/API/
# 浣欏 閿﹂殕 鏅鸿兘瀹跺眳
# VUE_APP_BASE_API = http://192.168.1.11/API/
+# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/鐢熶骇鐜
-VUE_APP_BASE_API = http://47.96.97.237/API/
+# VUE_APP_BASE_API = http://47.96.97.237/API/
#鏉滆春
# VUE_APP_BASE_API = http://localhost:8082/API/
# 璺敱鎳掑姞杞�
diff --git a/src/views/basic/gyUnit/gyUnit.vue b/src/views/basic/gyUnit/gyUnit.vue
index b4f1e6c..8bb80a0 100644
--- a/src/views/basic/gyUnit/gyUnit.vue
+++ b/src/views/basic/gyUnit/gyUnit.vue
@@ -447,16 +447,16 @@
this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
};
this.queryParams.HOrgID = sessionStorage["OrganizationID"];
+
+ this.riqiChange();
+ this.handleQuery();
},
beforeDestroy() {
// 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
delete window.editGyClose;
},
- created() {
- this.riqiChange();
- this.handleQuery();
- },
+ created() {},
methods: {
onDateScanOptionChangerHandler(e) {
this.queryParams.timeSpan = e;
@@ -1005,6 +1005,7 @@
sWhere += " and 绂佺敤鏍囪 = '' and ISNULL(瀹℃牳浜�,'') != ''";
return sWhere;
}
+
return sWhere;
},
//鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
@@ -1095,7 +1096,8 @@
.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
.then(() => {
if (!this.rowForm.瀹℃牳浜�) {
- const InterID = this.rowForm.hmainid || this.rowForm.HItemID || this.rowForm.HInterID;
+ const InterID =
+ this.rowForm.hmainid || this.rowForm.HItemID || this.rowForm.HInterID;
axios
.get(this.baseURL + "DeltetGy_Unit", {
params: {
@@ -1147,8 +1149,8 @@
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
-
-
+
+
// 鍙嶇鐢�/绂佺敤鏁版嵁
set_De_Stop(num, form) {
@@ -1224,7 +1226,6 @@
);
return org ? org.Name : ''; // 鍙繑鍥炵粍缁囧悕绉�
},
-
// 鎻愪氦涓婁紶鏂囦欢
submitFileForm() {
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 9e4f8f4..1ff56a8 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -7,7 +7,7 @@
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
<div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">杩愬崟缂栬緫鏂板</div>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="鍩烘湰淇℃伅" name="first">
<el-row>
@@ -37,7 +37,7 @@
<el-form-item label="鎵胯繍鍟�" prop="HCarrierName">
<el-input v-model="form.HCarrierName" placeholder="璇疯緭鍏ユ壙杩愬晢">
<el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(5)"></el-button>
+ @click="openDataDialog(6)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -53,7 +53,7 @@
<el-form-item label="濮嬪彂鍦�" prop="HBeginAddrName">
<el-input v-model="form.HBeginAddrName" placeholder="璇疯緭鍏ュ鍙戝湴">
<el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(7)"></el-button>
+ @click="openDataDialog('鏆傛棤')"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -61,7 +61,7 @@
<el-form-item label="鐩殑鍦�" prop="HEndAddrName">
<el-input v-model="form.HEndAddrName" placeholder="璇疯緭鍏ョ洰鐨勫湴">
<el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(8)"></el-button>
+ @click="openDataDialog('鏆傛棤')"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -71,7 +71,7 @@
<el-form-item label="杞﹀瀷" prop="HCarTypeName">
<el-input v-model="form.HCarTypeName" placeholder="璇疯緭鍏ヨ溅鍨�">
<el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(9)"></el-button>
+ @click="openDataDialog(13)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -84,7 +84,7 @@
<el-form-item label="鎵胯繍鍚堝悓" prop="HContractTransportBillNo">
<el-input v-model="form.HContractTransportBillNo" placeholder="璇疯緭鍏ユ壙杩愬悎鍚�">
<el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(10)"></el-button>
+ @click="openDataDialog('鏆傛棤')"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -109,7 +109,7 @@
<el-form-item label="缁撶畻鏂瑰紡" prop="HSSName">
<el-input v-model="form.HSSName" placeholder="璇疯緭鍏ョ粨绠楁柟寮�">
<el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(11)"></el-button>
+ @click="openDataDialog('鏆傛棤')"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -117,7 +117,7 @@
<el-form-item label="甯佸埆" prop="HCurName">
<el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�">
<el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(12)"></el-button>
+ @click="openDataDialog('鏆傛棤')"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -219,7 +219,7 @@
<el-form-item label="杞﹁締" prop="HCarName">
<el-input v-model="form.HCarName" placeholder="璇疯緭鍏ヨ溅杈�">
<el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(13)"></el-button>
+ @click="openDataDialog(14)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -227,7 +227,7 @@
<el-form-item label="鍙告満" prop="HDriverName">
<el-input v-model="form.HDriverName" placeholder="璇疯緭鍏ュ徃鏈�">
<el-button slot="append" icon="el-icon-search"
- @click="openDataDialog(14)"></el-button>
+ @click="openDataDialog(15)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -413,6 +413,10 @@
<!-- 鍙戣揣閫氱煡鍗� -->
<XsSeOutStockBill @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="xsSeOutStockBillShow" />
<GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
+ <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+ <GyCartype @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCartypeShow" />
+ <GyCar @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCarShow" />
+ <GyDriver @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyDriverShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -434,10 +438,13 @@
import Material from '@/views/component/material'
import XsSeOutStockBill from '@/views/sell/XsSeOutStockBill.vue'
import GyCustomer from '@/views/GyCustomer'
-
+import GySupplier from "@/views/basic/gy/gySupplier.vue";
+import GyCartype from "@/views/basic/gyCartypelist/gyCartypelist.vue"
+import GyCar from "@/views/basic/gyCar/gyCarList.vue"
+import GyDriver from "@/views/system/user/GyDriver.vue"
export default {
name: 'SellOutBill',
- components: { Dept, Warehouse, Material, RowSettings, XsSeOutStockBill, GyCustomer },
+ components: { Dept, Warehouse, Material, RowSettings, XsSeOutStockBill, GyCustomer, GySupplier, GyCartype, GyCar, GyDriver },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -472,6 +479,10 @@
stockPlaceShow: false, //浠撲綅鏁版嵁缁勪欢鏄剧ず鏍囪
xsSeOutStockBillShow: false, //鍘熷崟锛堝彂璐ч�氱煡鍗曪級鏁版嵁缁勪欢鏄剧ず鏍囪
gyCustomerShow: false, //瀹㈡埛鏁版嵁缁勪欢鏄剧ず鏍囪
+ gySupplierShow: false, //鎵胯繍鍟嗘暟鎹粍浠舵樉绀烘爣璁�
+ gyCartypeShow: false, //杞﹀瀷鏁版嵁缁勪欢鏄剧ず鏍囪
+ gyCarShow: false, //杞﹁締鏁版嵁缁勪欢鏄剧ず鏍囪
+ gyDriverShow: false, //鍙告満鏁版嵁缁勪欢鏄剧ず鏍囪
deptform: {}, //寮圭獥閫変腑鏁版嵁
temp: undefined, //涓存椂鍙橀噺
@@ -905,6 +916,10 @@
this.dialogTitle = '浠撲綅鍒楄〃'
this.stockPlaceShow = true
this.openData = true
+ } else if (num == 6) {
+ this.dialogTitle = '鎵胯繍鍟嗗垪琛�'
+ this.gySupplierShow = true
+ this.openData = true
} else if (num == 7) {
this.dialogTitle = '瀹㈡埛鍒楄〃'
this.gyCustomerShow = true
@@ -912,6 +927,18 @@
} else if (num == 12) {
this.dialogTitle = '婧愬崟鍒楄〃'
this.xsSeOutStockBillShow = true
+ this.openData = true
+ } else if (num == 13) {
+ this.dialogTitle = '杞﹀瀷鍒楄〃'
+ this.gyCartypeShow = true
+ this.openData = true
+ } else if (num == 14) {
+ this.dialogTitle = '杞﹁締鍒楄〃'
+ this.gyCarShow = true
+ this.openData = true
+ } else if (num == 15) {
+ this.dialogTitle = '杞﹁締鍒楄〃'
+ this.gyDriverShow = true
this.openData = true
}
@@ -923,6 +950,10 @@
this.materialShow = false
this.gyCustomerShow = false
this.xsSeOutStockBillShow = false
+ this.gySupplierShow = false
+ this.gyCartypeShow = false
+ this.gyCarShow = false
+ this.gyDriverShow = false
},
//#endregion
//#endregion
@@ -956,13 +987,36 @@
this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�
this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
this.openData = false
+ } else if (num == 6) {
+ console.log(deptRow)
+ this.form.HCarrierName = deptRow.渚涘簲鍟嗗悕绉�
+ this.form.HCarrierID = deptRow.HItemID
+ this.gySupplierShow = false
+ this.openData = false
} else if (num == 7) {
this.form.HCusName = deptRow.瀹㈡埛鍚嶇О
this.form.HCusID = deptRow.HItemID
this.gyCustomerShow = false
this.openData = false
- } else if (num == 12) { //鐗╂枡
+ } else if (num == 12) {
this.xsSeOutStockBillShow = false
+ this.openData = false
+ } else if (num == 13) {
+ this.form.HCarTypeName = deptRow.杞﹀瀷鍚嶇О
+ this.form.HCarTypeID = deptRow.HItemID
+ this.form.HCarTypeMaxVolume = deptRow["鏈�澶т綋绉�(绔嬫柟绫�)"]
+ this.calculateLoadingRate(parseFloat($('#HTotalVolume').val()) || 0);
+ this.gyCartypeShow = false
+ this.openData = false
+ } else if (num == 14) {
+ this.form.HCarName = deptRow.杞﹁締鍚嶇О
+ this.form.HCarID = deptRow.HItemID
+ this.gyCarShow = false
+ this.openData = false
+ } else if (num == 15) {
+ this.form.HDriverName = deptRow.椹鹃┒鍛樺悕绉�
+ this.form.HDriverID = deptRow.HItemID
+ this.gyDriverShow = false
this.openData = false
}
},
@@ -1107,10 +1161,10 @@
HSalePrice: 0,
HSeOrderInterID: 741,
HSeOrderEntryID: 18,
- HSeOrderBillNo: 'XSFH00000747',
+ HSeOrderBillNo: '',
HSourceInterID: 741,
HSourceEntryID: 18,
- HSourceBillNo: 'XSFH00000747',
+ HSourceBillNo: '',
HSourceBillType: 1402,
HRelationQty: 0,
HRelationMoney: 0,
@@ -1364,6 +1418,18 @@
});
},
//#endregion
+
+ // 璁＄畻瑁呰浇鐜囧嚱鏁�
+ calculateLoadingRate(totalVolume) {
+ var maxVolume = parseFloat((this.form.HCarTypeMaxVolume).val()) || 0;
+ if (maxVolume > 0) {
+ var loadingRate = (totalVolume / maxVolume * 100).toFixed(2);
+ this.form.HLoadingRate=loadingRate + "%"
+ } else {
+ this.form.HLoadingRate==''
+ }
+ }
+ //#endregion
//#endregion
}
};
diff --git a/src/views/scMould/basicModeling/Gy_MouldFile.vue b/src/views/scMould/basicModeling/Gy_MouldFile.vue
index ef0898a..2a04a5d 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFile.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFile.vue
@@ -1152,8 +1152,8 @@
// this.form.HMouldWidth = data.HMouldWidth
// this.form.HMouldHeight = data.HMouldHeight
// this.form.HMouldFoldHeight = data.HMouldFoldHeight
- this.form.HTransPackFlag = data.鍙戣揣瀹瑰櫒鏍囪
- this.form.HSendPackFlag = data.鍛ㄨ浆瀹瑰櫒鏍囪
+ this.form.HTransPackFlag = data.鍛ㄨ浆瀹瑰櫒鏍囪
+ this.form.HSendPackFlag = data.鍙戣揣瀹瑰櫒鏍囪
this.form.HMouldFoldHeight = data.鎶樺彔楂樺害
this.form.HMouldLength = data.闀�
this.form.HMouldWidth = data.瀹�
--
Gitblit v1.9.1