From 8c2293edbea20fdac6705641acdccdbdc6c8c4b6 Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期二, 07 四月 2026 10:12:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue | 4
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue | 5 +
src/utils/ruoyi.js | 4 +
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue | 4 -
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue | 4 -
.env.staging | 2
.env.development | 1
src/views/ProductInBill/Kf_ProductInBillList.vue | 2
src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue | 54 +++++++++++++++++
src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue | 42 +++++++-------
.env.production | 8 +-
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue | 4
src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue | 5 +
13 files changed, 96 insertions(+), 43 deletions(-)
diff --git a/.env.development b/.env.development
index 0352509..b084cc9 100644
--- a/.env.development
+++ b/.env.development
@@ -20,6 +20,7 @@
#鏉滆春
# VUE_APP_BASE_API = http://localhost:8082/API/
# 鍐呯綉鍦板潃娴嬭瘯
+VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# 璺敱鎳掑姞杞�
diff --git a/.env.production b/.env.production
index ec7dfbe..c6109e2 100644
--- a/.env.production
+++ b/.env.production
@@ -5,16 +5,16 @@
ENV = 'production'
# 瀹佹尝 鍥涚淮灏�
-VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
-VUE_APP_BASE_API = http://220.189.218.155:9010/API/
+# VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
+# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
# 浣欏 閿﹂殕 鏅鸿兘瀹跺眳
# VUE_APP_BASE_API_INNER = 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/
# 闄堥晲鍝�
-VUE_APP_BASE_API = http://localhost:81/API/
+# VUE_APP_BASE_API = http://localhost:81/API/
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
\ No newline at end of file
diff --git a/.env.staging b/.env.staging
index ceed279..a95581a 100644
--- a/.env.staging
+++ b/.env.staging
@@ -9,7 +9,7 @@
ENV = 'staging'
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/娴嬭瘯鐜
-VUE_APP_BASE_API = 'http://localhost:81/API/'
+VUE_APP_BASE_API = http://localhost:81/API/
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 3de2d98..7d76329 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -193,7 +193,9 @@
for (const propName of Object.keys(params)) {
const value = params[propName]
var part = encodeURIComponent(propName) + "="
- if (value !== null && value !== "" && typeof (value) !== "undefined") {
+ if (value !== null
+ // && value !== ""
+ && typeof (value) !== "undefined") {
if (typeof value === 'object') {
for (const key of Object.keys(value)) {
if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') {
diff --git a/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue b/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue
index 2013d8c..5169afa 100644
--- a/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue
+++ b/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue
@@ -917,7 +917,7 @@
if (response.data.count == 1) {
this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
this.$modal.msgSuccess(response.data.Message);
- this.get_MAXNum_Task(1);//璁剧疆娴佹按鍙峰鍔�
+ // this.get_MAXNum_Task(1);//璁剧疆娴佹按鍙峰鍔�
if (response.data.Verify == "Y") //鑷姩瀹℃牳
{
this.set_CheckBill(0, this.form); //瀹℃牳
@@ -1159,26 +1159,26 @@
},
//#endregion
- //#region 鑾峰彇鏈�澶у崟鎹彿
- get_MAXNum_Task(Type) {
- const formatDate = this.form.HDate
- ? new Date(this.form.HDate).toISOString().split('T')[0]
- : new Date().toISOString().split('T')[0];
- var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1201','${formatDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
- axios({
- method: 'get',
- url: this.$baseUrl + "/CommonModel/searchMethod",
- params: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
- }).then(response => {
- if (response.data.count == 1) {
- this.form.HBillNo = response.data.data[0].HBillNo;
- } else {
- this.$modal.msgError(response.data.code + response.data.Message);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
+ // //#region 鑾峰彇鏈�澶у崟鎹彿
+ // get_MAXNum_Task(Type) {
+ // const formatDate = this.form.HDate
+ // ? new Date(this.form.HDate).toISOString().split('T')[0]
+ // : new Date().toISOString().split('T')[0];
+ // var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1201','${formatDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
+ // axios({
+ // method: 'get',
+ // url: this.$baseUrl + "/CommonModel/searchMethod",
+ // params: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
+ // }).then(response => {
+ // if (response.data.count == 1) {
+ // this.form.HBillNo = response.data.data[0].HBillNo;
+ // } else {
+ // this.$modal.msgError(response.data.code + response.data.Message);
+ // }
+ // }).catch(error => {
+ // this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ // });
+ // },
//#endregion
//#region 鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
diff --git a/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue b/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue
index ba5ea40..6cea393 100644
--- a/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue
+++ b/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue
@@ -123,6 +123,10 @@
@click="handleEdit(row = rowForm, OperationType = 3)">缂栬緫</el-button>
</el-col>
<el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-Pallet" size="mini" :disabled="single" @click="set_PalletChange">鎵樻暟鍙樻洿
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
<el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
@click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
</el-col>
@@ -397,10 +401,58 @@
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
- this.queryParams.HOrgID = sessionStorage["OrganizationID"];
+
+ const orgId = sessionStorage["OrganizationID"];
+ this.queryParams.HOrgID = orgId ? Number(orgId) : null;
+ this.$forceUpdate();
},
//#endregion
+ set_PalletChange() {
+ if (!this.rowForm || !this.rowForm.hmainid) {
+ this.$modal.msgError('璇峰厛閫夋嫨涓�鏉¤褰曪紒')
+ return
+ }
+
+ const rowData = this.rowForm // 浣跨敤 rowForm 鑰屼笉鏄� rowList
+ const currentPallet = rowData.鎵樻暟 || 0
+
+ // 灏�"璇疯緭鍏ユ柊鎵樻暟"浣滀负杈撳叆妗嗙殑placeholder
+ this.$prompt(`褰撳墠鎵樻暟锛�${currentPallet}`, {
+ confirmButtonText: '淇濆瓨',
+ cancelButtonText: '鍙栨秷',
+ inputValue: currentPallet,
+ inputType: 'number',
+ inputValidator: (value) => {
+ if (!value) return '璇疯緭鍏ユ墭鏁帮紒'
+ const num = parseInt(value)
+ if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
+ if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
+ if (num < 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ return true
+ }
+ }).then(({ value }) => {
+ const newPallet = parseInt(value)
+
+ return axios.post(this.$baseUrl + '/Kf_POStockInBill/UpdatePallet', {
+ hmainid: rowData.hmainid,
+ newPallet: newPallet,
+ operator: sessionStorage["HUserName"]
+ })
+ }).then(response => {
+ if (response.data && response.data.count == 1) {
+ this.$modal.msgSuccess('鎵樻暟鍙樻洿鎴愬姛锛�')
+ this.getList()
+ } else {
+ this.$modal.msgError('閿欒锛�' + (response.data.Message || '淇濆瓨澶辫触'))
+ }
+ }).catch(error => {
+ if (error !== 'cancel') {
+ this.$modal.msgError('鎿嶄綔澶辫触锛�' + error.message)
+ }
+ })
+ },
+
//#region 閲嶇疆
resetQuery() {
this.sWhere = ''
diff --git a/src/views/ProductInBill/Kf_ProductInBillList.vue b/src/views/ProductInBill/Kf_ProductInBillList.vue
index 0a7958b..1b97fa0 100644
--- a/src/views/ProductInBill/Kf_ProductInBillList.vue
+++ b/src/views/ProductInBill/Kf_ProductInBillList.vue
@@ -664,7 +664,7 @@
this.rowHideShow = true
this.openRowHide = true
},
- set_PalletChange() {
+ set_PalletChange() {
if (!this.rowForm || !this.rowForm.hmainid) {
this.$modal.msgError('璇峰厛閫夋嫨涓�鏉¤褰曪紒')
return
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
index eb3a114..74eca8d 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -95,9 +95,9 @@
<el-col :span="6">
<el-form-item v-show="HIsShow" label="瀛愬崟鎹被鍨�" prop="HBillSubType">
<el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
- <el-option label="鍙戣揣" value="鍙戣揣"></el-option>
+ <el-option label="閲囪喘鍏ュ簱" value="閲囪喘鍏ュ簱"></el-option>
+ <el-option label="鐢熶骇鍏ュ簱" value="鐢熶骇鍏ュ簱"></el-option>
<el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
- <el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
<el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
</el-select>
</el-form-item>
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
index 84e8091..415afb9 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -35,9 +35,7 @@
<el-form-item label="瀛愬崟鎹被鍨�" prop="HBillSubType">
<el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
<el-option label="鍙戣揣" value="鍙戣揣"></el-option>
- <el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
- <el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
- <el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
+ <el-option label="鍐呴儴璋冩嫧" value="鍐呴儴璋冩嫧"></el-option>
</el-select>
</el-form-item>
</el-col>
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
index ff7defe..fa78168 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
@@ -95,10 +95,11 @@
<el-col :span="6">
<el-form-item v-show="HIsShow" label="瀛愬崟鎹被鍨�" prop="HBillSubType">
<el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
+ <el-option label="鐢熶骇棰嗙敤" value="鐢熶骇棰嗙敤"></el-option>
+ <el-option label="棰嗙敤閫�搴�" value="棰嗙敤閫�搴�"></el-option>
<el-option label="鍙戣揣" value="鍙戣揣"></el-option>
- <el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
<el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
- <el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
+ <el-option label="鎶ュ簾鍑哄簱" value="鎶ュ簾鍑哄簱"></el-option>
</el-select>
</el-form-item>
</el-col>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
index 4ceb76d..bd1c049 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -117,9 +117,9 @@
<el-col :span="6">
<el-form-item v-show="HIsShow" label="瀛愬崟鎹被鍨�" prop="HBillSubType">
<el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
- <el-option label="鍙戣揣" value="鍙戣揣"></el-option>
+ <el-option label="閲囪喘鍏ュ簱" value="閲囪喘鍏ュ簱"></el-option>
+ <el-option label="鐢熶骇鍏ュ簱" value="鐢熶骇鍏ュ簱"></el-option>
<el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
- <el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
<el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
</el-select>
</el-form-item>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
index 282f30d..6aedf1b 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -59,9 +59,7 @@
<el-form-item label="瀛愬崟鎹被鍨�" prop="HBillSubType">
<el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
<el-option label="鍙戣揣" value="鍙戣揣"></el-option>
- <el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
- <el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
- <el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
+ <el-option label="鍐呴儴璋冩嫧" value="鍐呴儴璋冩嫧"></el-option>
</el-select>
</el-form-item>
</el-row>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
index c371703..dc06039 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -117,10 +117,11 @@
<el-col :span="6">
<el-form-item v-show="HIsShow" label="瀛愬崟鎹被鍨�" prop="HBillSubType">
<el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
+ <el-option label="鐢熶骇棰嗙敤" value="鐢熶骇棰嗙敤"></el-option>
+ <el-option label="棰嗙敤閫�搴�" value="棰嗙敤閫�搴�"></el-option>
<el-option label="鍙戣揣" value="鍙戣揣"></el-option>
- <el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
<el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
- <el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
+ <el-option label="鎶ュ簾鍑哄簱" value="鎶ュ簾鍑哄簱"></el-option>
</el-select>
</el-form-item>
</el-col>
--
Gitblit v1.9.1