From 948a79282b0402364ea0078f536b2f1a07fbb400 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 07 四月 2026 23:50:08 +0800
Subject: [PATCH] 容器管理下的仓储管理问题修复
---
src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue | 4
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue | 23 +++++--
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue | 20 +++++-
src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue | 49 ++++++++++++++++
src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue | 3
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue | 11 ++-
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue | 9 ++-
src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue | 13 +++-
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue | 41 ++++++++++---
9 files changed, 140 insertions(+), 33 deletions(-)
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
index 04ecc87..f95c3ad 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd HH:mm:ss">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -34,7 +34,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item v-show="HIsShow" label="寰�鏉ョ被鍨�" prop="HSupTypeID">
+ <el-form-item v-show="false" label="寰�鏉ョ被鍨�" prop="HSupTypeID">
<el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�" @change="form.HSupName='',form.HSupId=0">
<el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
</el-option>
@@ -42,7 +42,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item v-show="HIsShow" label="寰�鏉ュ崟浣�" prop="HSupName">
+ <el-form-item v-show="false" label="寰�鏉ュ崟浣�" prop="HSupName">
<el-input v-model="form.HSupName" placeholder="璇烽�夋嫨寰�鏉ュ崟浣�" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
</el-input>
@@ -1017,6 +1017,9 @@
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
+ if (this.form.HDate) {
+ this.form.HDate = moment(this.form.HDate).format('YYYY-MM-DD');
+ }
this.$refs["form"].validate(valid => {
if (valid) {
let fhck = false
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
index e67ee28..414e6bd 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd HH:mm:ss">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -42,7 +42,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item v-show="HIsShow" label="寰�鏉ョ被鍨�" prop="HSupTypeID">
+ <el-form-item v-show="false" label="寰�鏉ョ被鍨�" prop="HSupTypeID">
<el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�" @change="form.HSupName='',form.HSupId=0">
<el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
</el-option>
@@ -50,7 +50,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item v-show="HIsShow" label="寰�鏉ュ崟浣�" prop="HSupName">
+ <el-form-item v-show="false" label="寰�鏉ュ崟浣�" prop="HSupName">
<el-input v-model="form.HSupName" placeholder="璇烽�夋嫨寰�鏉ュ崟浣�" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
</el-input>
@@ -890,6 +890,7 @@
, "HDeleteMan": data.浣滃簾浜�
, "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : data.浣滃簾鏃ユ湡
}
+ console.log("ci form",this.form)
this.form.HStockInOrgID = data.HStockInOrgID == null ? 0 : data.HStockInOrgID;
this.form.HStockOutOrgID = data.HStockOutOrgID == null ? 0 : data.HStockOutOrgID;
//瀛愯〃
@@ -1116,6 +1117,9 @@
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
+ if (this.form.HDate) {
+ this.form.HDate = moment(this.form.HDate).format('YYYY-MM-DD');
+ }
this.$refs["form"].validate(valid => {
if (valid) {
let fhck = false
@@ -1146,6 +1150,7 @@
var sMainStr = JSON.stringify(this.form);
var sSubStr = JSON.stringify(this.editData);
var sMainSub = sMainStr + ';' + sSubStr + ';' + Operation + ";" + sessionStorage["HUserName"];
+ console.log(sMainStr)
axios({
method: 'post',
url: this.$baseUrl + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Save_Json",
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
index 8d482d6..a03e1ca 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd HH:mm:ss">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -34,7 +34,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item v-show="HIsShow" label="寰�鏉ョ被鍨�" prop="HSupTypeID">
+ <el-form-item v-show="false" label="寰�鏉ョ被鍨�" prop="HSupTypeID">
<el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�" @change="form.HSupName='',form.HSupId=0">
<el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
</el-option>
@@ -42,7 +42,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item v-show="HIsShow" label="寰�鏉ュ崟浣�" prop="HSupName">
+ <el-form-item v-show="false" label="寰�鏉ュ崟浣�" prop="HSupName">
<el-input v-model="form.HSupName" placeholder="璇烽�夋嫨寰�鏉ュ崟浣�" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
</el-input>
@@ -212,7 +212,7 @@
size="mini">涓婄Щ</el-button>
<el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
size="mini">涓嬬Щ</el-button>
- <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
+ <!-- <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button> -->
<el-button type="success" plain icon="el-icon-printer" @click="get_ContainerInstantStock(zbSelForm)">瀹瑰櫒鍗虫椂搴撳瓨</el-button>
</div>
@@ -975,6 +975,7 @@
, "HDeleteMan": data.浣滃簾浜�
, "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : data.浣滃簾鏃ユ湡
}
+ console.log('form鐨勫唴瀹�',this.form)
this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID;
//瀛愯〃
@@ -1166,6 +1167,9 @@
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
+ if (this.form.HDate) {
+ this.form.HDate = moment(this.form.HDate).format('YYYY-MM-DD');
+ }
this.$refs["form"].validate(valid => {
if (valid) {
let fhck = false
@@ -1196,6 +1200,7 @@
var sMainStr = JSON.stringify(this.form);
var sSubStr = JSON.stringify(this.editData);
var sMainSub = sMainStr + ';' + sSubStr + ';' + Operation + ";" + sessionStorage["HUserName"];
+ console.log(sMainStr)
axios({
method: 'post',
url: this.$baseUrl + "/Sc_MouldOutRequestBillController/GetSc_MouldOutRequestBill_Save_Json",
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
index a383e45..c3fb8c7 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
@@ -155,14 +155,14 @@
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
@click="set_CheckBill(2, form = rowForm)">鍙嶅鏍�</el-button>
</el-col>
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
@click="set_CheckBillAll(1, ids)">瀹℃牳(鎵归噺)</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
@click="set_CheckBillAll(2, ids)">鍙嶅鏍�(鎵归噺)</el-button>
- </el-col>
+ </el-col> -->
<!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
</el-col> -->
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
index 636095f..d21520a 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd HH:mm:ss">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -34,7 +34,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item v-show="HIsShow" label="寰�鏉ョ被鍨�" prop="HSupTypeID">
+ <el-form-item v-show="false" label="寰�鏉ョ被鍨�" prop="HSupTypeID">
<el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�" @change="form.HSupName='',form.HSupId=0">
<el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
</el-option>
@@ -42,7 +42,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item v-show="HIsShow" label="寰�鏉ュ崟浣�" prop="HSupName">
+ <el-form-item v-show="false" label="寰�鏉ュ崟浣�" prop="HSupName">
<el-input v-model="form.HSupName" placeholder="璇烽�夋嫨寰�鏉ュ崟浣�" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
</el-input>
@@ -95,7 +95,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item v-show="HIsShow" label="婧愬崟绫诲瀷" prop="HSourceBillType">
+ <el-form-item v-show="false" label="婧愬崟绫诲瀷" prop="HSourceBillType">
<el-select v-model="form.HSourceBillType" placeholder="璇烽�夋嫨">
<el-option v-for="(item, index) in HSourceBillTypes" :key="index" :label="item.HSourceBillTypeName" :value="item.HSourceBillType">
</el-option>
@@ -103,7 +103,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item v-show="HIsShow" label="婧愬崟鍗曞彿" prop="HSourceBillNo">
+ <el-form-item v-show="false" label="婧愬崟鍗曞彿" prop="HSourceBillNo">
<el-input placeholder="璇烽�夋嫨婧愬崟鍗曞彿" disabled>
<el-button slot="append" icon="el-icon-search" @click="get_checkMainSource()"></el-button>
</el-input>
@@ -216,7 +216,7 @@
size="mini">涓婄Щ</el-button>
<el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
size="mini">涓嬬Щ</el-button>
- <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
+ <!-- <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button> -->
<el-button type="success" plain icon="el-icon-printer" @click="get_ContainerInstantStock(zbSelForm)">瀹瑰櫒鍗虫椂搴撳瓨</el-button>
</div>
<el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
@@ -614,6 +614,9 @@
this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
this.form.HBillSubType = data.HBillSubType
this.ifOrganizationEdit = true
+ this.form.HWHID= data.HWHID
+ this.form.HWHNumber= data.HWHNumber
+ this.form.HWHName= data.HWHName
console.log(dataArray)
//瀛愯〃 璧嬪��
var rowdata = [];
@@ -728,6 +731,11 @@
this.form.HWHName = deptRow.浠撳簱鍚嶇О
this.form.HWHID = deptRow.HItemID
this.form.HWHNumber = deptRow.浠撳簱浠ｇ爜
+ for(i=0;i<this.editData.length;i++){
+ this.editData[i].HWHID = deptRow.HItemID
+ this.editData[i].HWHNumber = deptRow.浠撳簱浠ｇ爜
+ this.editData[i].HWHName = deptRow.浠撳簱鍚嶇О
+ }
}else{
this.editData[this.zbIndex].HWHID = deptRow.HItemID
this.editData[this.zbIndex].HWHNumber = deptRow.浠撳簱浠ｇ爜
@@ -1264,6 +1272,9 @@
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
+ if (this.form.HDate) {
+ this.form.HDate = moment(this.form.HDate).format('YYYY-MM-DD');
+ }
this.$refs["form"].validate(valid => {
if (valid) {
let fhck = false
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
index 0fd6e4c..706d5ee 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
@@ -135,6 +135,7 @@
<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>
@@ -805,7 +806,7 @@
}).then(({ value }) => {
const newPallet = parseInt(value)
- return axios.post(this.$baseUrl + '/Sc_MouldProdBackBillController/UpdatePallet', {
+ return axios.post(this.$baseUrl + '/Sc_MouldProdMoveBillController/UpdatePallet', {
hmainid: rowData.hmainid,
newPallet: newPallet,
operator: sessionStorage["HUserName"]
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
index 6b3c4ba..1cc90ac 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd HH:mm:ss">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -34,7 +34,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item v-show="HIsShow" label="寰�鏉ョ被鍨�" prop="HSupTypeID">
+ <el-form-item v-show="false" label="寰�鏉ョ被鍨�" prop="HSupTypeID">
<el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�" @change="form.HSupName='',form.HSupId=0">
<el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
</el-option>
@@ -42,7 +42,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item v-show="HIsShow" label="寰�鏉ュ崟浣�" prop="HSupName">
+ <el-form-item v-show="false" label="寰�鏉ュ崟浣�" prop="HSupName">
<el-input v-model="form.HSupName" placeholder="璇烽�夋嫨寰�鏉ュ崟浣�" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
</el-input>
@@ -94,13 +94,13 @@
</el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item v-show="HIsShow" label="璐熻矗浜�" prop="HMangerName">
- <el-input v-model="form.HMangerName" placeholder="璇烽�夋嫨" disabled>
+ <el-input v-model="form.HManagerName" placeholder="璇烽�夋嫨" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=2)"></el-button>
</el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="6">
<el-form-item v-show="HIsShow" label="楠屾敹鍛�" prop="HSecManagerName">
<el-input v-model="form.HSecManagerName" placeholder="璇烽�夋嫨" disabled>
@@ -559,6 +559,7 @@
this.fetchData()
this.SourceBillType()
this.getdata()
+
},
methods: {
fetchData() {
@@ -867,10 +868,21 @@
this.form.HWHName = deptRow.浠撳簱鍚嶇О
this.form.HWHID = deptRow.HItemID
this.form.HWHNumber = deptRow.浠撳簱浠ｇ爜
+
+ for(i=0;i<this.editData.length;i++){
+ this.editData[i].HWHID = deptRow.HItemID
+ this.editData[i].HWHNumber = deptRow.浠撳簱浠ｇ爜
+ this.editData[i].HWHName = deptRow.浠撳簱鍚嶇О
+ }
}else if(this.eHWHType == 2){
this.form.HSCWHName = deptRow.浠撳簱鍚嶇О
this.form.HSCWHID = deptRow.HItemID
this.form.HSCWHNumber = deptRow.浠撳簱浠ｇ爜
+ for(i=0;i<this.editData.length;i++){
+ this.editData[i].HSCWHID = deptRow.HItemID
+ this.editData[i].HSCWHNumber = deptRow.浠撳簱浠ｇ爜
+ this.editData[i].HSCWHName = deptRow.浠撳簱鍚嶇О
+ }
}else if(this.eHWHType == 3){
this.editData[this.zbIndex].HWHID = deptRow.HItemID
this.editData[this.zbIndex].HWHNumber = deptRow.浠撳簱浠ｇ爜
@@ -924,13 +936,15 @@
this.openData = false
} else if (num == 9){
if(this.HSPType == 1){
- this.editData[this.zbIndex].HSPID = deptRow.HMainID
+ this.editData[this.zbIndex].HSPID = deptRow.HItemID || 0
this.editData[this.zbIndex].HSPNumber = deptRow.浠撲綅浠ｇ爜
this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
+ console.log( "浠撲綅id",deptRow.HItemID)
}else{
- this.editData[this.zbIndex].HSCSPID = deptRow.HMainID
+ this.editData[this.zbIndex].HSCSPID = deptRow.HItemID || 0
this.editData[this.zbIndex].HSCSPNumber = deptRow.浠撲綅浠ｇ爜
this.editData[this.zbIndex].HSCSPName = deptRow.浠撲綅鍚嶇О
+ console.log( "浠撲綅2id",deptRow.HItemID)
}
this.gyStockPlaceShow = false
this.openData = false
@@ -976,8 +990,8 @@
HSCWHID:0,
HEmpName:'',
HEmpID:0,
- HMangerName:'',
- HMangerID:0,
+ HManagerName:'',
+ HManagerID:0,
HSecManagerName:'',
HSecManagerID:0,
HKeeperName:'',
@@ -1166,6 +1180,7 @@
this.form.HStockInOrgID = data[0].HStockInOrgID == null ? 0 : data[0].HStockInOrgID;
this.form.HStockOutOrgID = data[0].HStockOutOrgID == null ? 0 : data[0].HStockOutOrgID;
//瀛愯〃 璧嬪��
+ console.log(response.data.data)
this.editData = response.data.data[0];
this.editData1 = response.data.data[1];
}
@@ -1336,9 +1351,12 @@
}
},
//#endregion
-
+
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
+ if (this.form.HDate) {
+ this.form.HDate = moment(this.form.HDate).format('YYYY-MM-DD');
+ }
this.$refs["form"].validate(valid => {
if (valid) {
let fhck = false
@@ -1380,6 +1398,7 @@
var sMainStr = JSON.stringify(this.form);
var sSubStr = JSON.stringify(this.editData);
var sMainSub = sMainStr + ';' + sSubStr + ';' + Operation + ";" + sessionStorage["HUserName"];
+ console.log(sSubStr)
axios({
method: 'post',
url: this.$baseUrl + "/Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Save_Json",
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
index b44515c..e59fba0 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
@@ -135,6 +135,10 @@
<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> -->
+ <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-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
</el-button>
@@ -585,6 +589,51 @@
return { "background": "#ecf5ff" }
}
},
+ //鎵樻暟鍙樻洿
+ 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 + '/Sc_MouldProdBackBillController/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)
+ }
+ })
+ },
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 2
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
index 4be62bc..4a49ecc 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" value-format="yyyy-MM-dd HH:mm:ss">
+ <el-date-picker v-model="form.HDate" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -34,7 +34,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item v-show="HIsShow" label="寰�鏉ョ被鍨�" prop="HSupTypeID">
+ <el-form-item v-show="false" label="寰�鏉ョ被鍨�" prop="HSupTypeID">
<el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�" @change="form.HSupName='',form.HSupId=0">
<el-option v-for="(item, index) in hSupTypeList" :key="index" :label="item.name" :value="item.id">
</el-option>
@@ -42,7 +42,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item v-show="HIsShow" label="寰�鏉ュ崟浣�" prop="HSupName">
+ <el-form-item v-show="false" label="寰�鏉ュ崟浣�" prop="HSupName">
<el-input v-model="form.HSupName" placeholder="璇烽�夋嫨寰�鏉ュ崟浣�" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
</el-input>
@@ -619,6 +619,8 @@
this.form.HBillSubType = data.HBillSubType
this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
this.ifOrganizationEdit = true
+ this.form.HWHName = data.HWHName
+ this.form.HWHID = data.HWHID
//瀛愯〃 璧嬪��
var rowdata = [];
for (let i = 0; i < dataArray.length; i++) {
@@ -732,6 +734,13 @@
this.form.HWHName = deptRow.浠撳簱鍚嶇О
this.form.HWHID = deptRow.HItemID
this.form.HWHNumber = deptRow.浠撳簱浠ｇ爜
+ for(i=0;i<this.editData.length;i++){
+ this.editData[i].HWHID = deptRow.HItemID
+ this.editData[i].HWHNumber = deptRow.浠撳簱浠ｇ爜
+ this.editData[i].HWHName = deptRow.浠撳簱鍚嶇О
+ console.log(this.editData[i].HWHID)
+ }
+
}else{
this.editData[this.zbIndex].HWHID = deptRow.HItemID
this.editData[this.zbIndex].HWHNumber = deptRow.浠撳簱浠ｇ爜
@@ -1007,9 +1016,11 @@
, "HUpDateDate": data[0].淇敼鏃ユ湡 == null ? "" : data[0].淇敼鏃ユ湡
, "HDeleteDate": data[0].浣滃簾鏃ユ湡 == null ? "" : data[0].浣滃簾鏃ユ湡
}
+
this.form.HStockOrgID = data[0].HMainStockOrgID == null ? 0 : data[0].HMainStockOrgID;
//瀛愯〃 璧嬪��
this.editData = response.data.data[0];
+ console.log(this.editData)
this.editData1 = response.data.data[1];
}
this.formShow = true
@@ -1265,6 +1276,9 @@
},
//#endregion
submitForm() {
+ if (this.form.HDate) {
+ this.form.HDate = moment(this.form.HDate).format('YYYY-MM-DD');
+ }
this.$refs["form"].validate(valid => {
if (valid) {
let fhck = false
--
Gitblit v1.9.1