From 414190deffd5bcfb6878bd2d631737bbb1dab01d Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期三, 14 一月 2026 08:45:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue | 2
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue | 27 +++++---
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue | 26 +++++---
src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue | 6 +-
src/views/basic/gyUnit/gyUnit.vue | 23 +++++--
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue | 2
src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue | 6 +-
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue | 8 +-
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue | 18 ++++-
src/views/basic/gyCurrency/gyCurrency.vue | 21 +++++-
src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue | 10 +-
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue | 8 +-
src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue | 8 +-
src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue | 6 +-
14 files changed, 107 insertions(+), 64 deletions(-)
diff --git a/src/views/basic/gyCurrency/gyCurrency.vue b/src/views/basic/gyCurrency/gyCurrency.vue
index 84d8f57..d386a36 100644
--- a/src/views/basic/gyCurrency/gyCurrency.vue
+++ b/src/views/basic/gyCurrency/gyCurrency.vue
@@ -1164,7 +1164,7 @@
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.hmainid)) {
+ if (this.ids.includes(row.HItemID)) {
return { background: "#ecf5ff" };
}
},
@@ -1186,11 +1186,22 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
- this.ids = selection.map((item) => item.hmainid);
- this.single = selection.length != 1;
- this.multiple = !selection.length;
- if (!this.single) {
+ if (this.openPage) {
+ //鍒楄〃鍗曢��
+ if (selection.length > 1) {
+ const del_row = selection.shift();
+ this.$refs.tableData.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ this.rowForm = {};
+ this.ids = selection.map((item) => item.HItemID);
this.rowForm = selection[0];
+ } else {
+ this.ids = selection.map((item) => item.HItemID);
+ this.single = selection.length != 1;
+ this.multiple = !selection.length;
+ if (!this.single) {
+ this.rowForm = selection[0];
+ }
}
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
diff --git a/src/views/basic/gyUnit/gyUnit.vue b/src/views/basic/gyUnit/gyUnit.vue
index bfbf894..b4f1e6c 100644
--- a/src/views/basic/gyUnit/gyUnit.vue
+++ b/src/views/basic/gyUnit/gyUnit.vue
@@ -858,7 +858,7 @@
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.hmainid)) {
+ if (this.ids.includes(row.HItemID)) {
return { background: "#ecf5ff" };
}
},
@@ -880,14 +880,25 @@
}
this.handleEdit(row, this.OperationType);
},
- // 澶氶�夋閫変腑鏁版嵁
+ // 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
- this.ids = selection.map((item) => item.hmainid);
- this.single = selection.length != 1;
- this.multiple = !selection.length;
- if (!this.single) {
+ if (this.openPage) {
+ //鍒楄〃鍗曢��
+ if (selection.length > 1) {
+ const del_row = selection.shift();
+ this.$refs.tableData.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ this.rowForm = {};
+ this.ids = selection.map((item) => item.HItemID);
this.rowForm = selection[0];
+ } else {
+ this.ids = selection.map((item) => item.HItemID);
+ this.single = selection.length != 1;
+ this.multiple = !selection.length;
+ if (!this.single) {
+ this.rowForm = selection[0];
+ }
}
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
index b912983..be19c5c 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 label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -35,7 +35,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
- <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+ <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>
</el-select>
@@ -628,7 +628,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -665,7 +665,7 @@
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
} else {
this.form = {
"HBillNo": data.鍗曟嵁鍙�
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
index d8798d7..5a3780a 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
@@ -131,10 +131,10 @@
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
@click="handleEdit(row = rowForm, OperationType = 2)">缂栬緫</el-button>
</el-col>
- <el-col :span="1.5">
+ <!-- <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>
+ </el-col> -->
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-tickets" size="mini"
@click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堝鍣ㄩ鐢ㄩ��搴撳崟锛�</el-button>
@@ -151,14 +151,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> -->
@@ -857,7 +857,7 @@
this.getList()
this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
index 3dcbdcd..0c8ca84 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 label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -35,7 +35,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
- <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+ <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>
</el-select>
@@ -693,7 +693,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -733,7 +733,7 @@
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
} else {
this.form = {
"HBillNo": data.鍗曟嵁鍙�
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
index 063126d..12fa2da 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
@@ -852,7 +852,7 @@
this.getList()
this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
index b293a93..36523f2 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 label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -35,7 +35,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
- <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+ <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>
</el-select>
@@ -721,7 +721,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -758,7 +758,7 @@
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
} else {
this.form = {
"HBillNo": data.鍗曟嵁鍙�
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
index 9befbf0..69b9299 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
@@ -857,7 +857,7 @@
this.getList()
this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
index dfb6e00..1455ae6 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 label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -35,7 +35,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
- <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+ <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>
</el-select>
@@ -224,12 +224,12 @@
</el-table-column>
<el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HMaterSpec }}</span>
+ <span>{{ scope.row.HMaterModel }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="璁￠噺鍗曚綅浠ｇ爜" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HUnitCode }}</span>
+ <span>{{ scope.row.HUnitNumber }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
@@ -261,7 +261,7 @@
</el-table-column>
<el-table-column align="center" label="浠撲綅浠ｇ爜" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HSPCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row)"
+ <el-input v-model="scope.row.HSPNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row)"
@dblclick.native="openDataDialog(9, scope.row)" />
</template>
</el-table-column>
@@ -573,12 +573,19 @@
this.form.HSupTypeID = data.HSupTypeID
this.form.HSupID = data.HSupID
this.form.HSupName = data.HSupName
- this.form.HSecManagerId = data.HSecManagerID
+ this.form.HEmpID = data.HEmpID
+ this.form.HEmpName = data.HEmpName
+ this.form.HManagerID = data.HManagerID
+ this.form.HManagerName = data.HManagerName
+ this.form.HKeeperID = data.HKeeperID
+ this.form.HKeeperName = data.HKeeperName
+ this.form.HSecManagerID = data.HSecManagerID
this.form.HSecManagerName = data.HSecManagerName
this.form.HDeptID = data.HDeptID
this.form.HDeptName = data.HDeptName
this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
this.ifOrganizationEdit = true
+ console.log(dataArray)
//瀛愯〃 璧嬪��
var rowdata = [];
for (let i = 0; i < dataArray.length; i++) {
@@ -741,7 +748,7 @@
this.openData = false
} else if (num == 9){
this.editData[this.zbIndex].HSPID = deptRow.HMainID
- this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠ｇ爜
+ this.editData[this.zbIndex].HSPNumber = deptRow.浠撲綅浠ｇ爜
this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
this.gyStockPlaceShow = false
this.openData = false
@@ -858,7 +865,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -888,7 +895,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
//璁剧疆婧愬崟绫诲瀷
this.form.HSourceBillType = this.HSouceBillType
@@ -928,7 +935,7 @@
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
} else {
if (data[0].HSourceInterID != "0") {
this.ifOrganizationEdit = true
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
index 63b2a18..57e38e9 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
@@ -772,14 +772,14 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- axios.get(this.baseURL + "/Sc_MouldProdBackBill/DeltetMouldProdBackBill", {
- params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
+ axios.get(this.baseURL + "/Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Delete_Json", {
+ params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
}).then(response => {
if (response.data.count == 1) {
this.getList()
this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
index a34b084..11e2035 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 label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -35,7 +35,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
- <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+ <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>
</el-select>
@@ -622,6 +622,14 @@
this.form.HSupTypeID = data.HSupTypeID
this.form.HSupID = data.HSupID
this.form.HSupName = data.HSupName
+ this.form.HEmpID = data.HEmpID
+ this.form.HEmpName = data.HEmpName
+ this.form.HManagerID = data.HManagerID
+ this.form.HManagerName = data.HManagerName
+ this.form.HKeeperID = data.HKeeperID
+ this.form.HKeeperName = data.HKeeperName
+ this.form.HSecManagerID = data.HSecManagerID
+ this.form.HSecManagerName = data.HSecManagerName
this.form.HDeptID = data.HDeptID
this.form.HDeptName = data.HDeptName
this.form.HStockOrgID = data.HStockOutOrgID
@@ -930,7 +938,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -960,7 +968,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
//璁剧疆婧愬崟绫诲瀷
this.form.HSourceBillType = this.HSouceBillType
@@ -1000,7 +1008,7 @@
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
} else {
if (data[0].HSourceInterID != "0") {
this.ifOrganizationEdit = true
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
index fc5263f..a6752cc 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
@@ -773,14 +773,14 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- axios.get(this.baseURL + "/Sc_MouldProdMoveBill/DeltetMouldProdMoveBill", {
- params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
+ axios.get(this.baseURL + "/Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Delete_Json", {
+ params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
}).then(response => {
if (response.data.count == 1) {
this.getList()
this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
index 4aa8b9b..a365cb8 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 label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -35,7 +35,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
- <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+ <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>
</el-select>
@@ -224,12 +224,12 @@
</el-table-column>
<el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HMaterSpec }}</span>
+ <span>{{ scope.row.HMaterModel }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="璁￠噺鍗曚綅浠ｇ爜" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HUnitCode }}</span>
+ <span>{{ scope.row.HUnitNumber }}</span>
</template>
</el-table-column>
<el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
@@ -261,7 +261,7 @@
</el-table-column>
<el-table-column align="center" label="浠撲綅浠ｇ爜" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HSPCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row)"
+ <el-input v-model="scope.row.HSPNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row)"
@dblclick.native="openDataDialog(9, scope.row)" />
</template>
</el-table-column>
@@ -573,7 +573,13 @@
this.form.HSupTypeID = data.HSupTypeID
this.form.HSupID = data.HSupID
this.form.HSupName = data.HSupName
- this.form.HSecManagerId = data.HSecManagerID
+ this.form.HEmpID = data.HEmpID
+ this.form.HEmpName = data.HEmpName
+ this.form.HManagerID = data.HManagerID
+ this.form.HManagerName = data.HManagerName
+ this.form.HKeeperID = data.HKeeperID
+ this.form.HKeeperName = data.HKeeperName
+ this.form.HSecManagerID = data.HSecManagerID
this.form.HSecManagerName = data.HSecManagerName
this.form.HDeptID = data.HDeptID
this.form.HDeptName = data.HDeptName
@@ -741,7 +747,7 @@
this.openData = false
} else if (num == 9){
this.editData[this.zbIndex].HSPID = deptRow.HMainID
- this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠ｇ爜
+ this.editData[this.zbIndex].HSPNumber = deptRow.浠撲綅浠ｇ爜
this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
this.gyStockPlaceShow = false
this.openData = false
@@ -857,7 +863,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -887,7 +893,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
//璁剧疆婧愬崟绫诲瀷
this.form.HSourceBillType = this.HSouceBillType
@@ -927,7 +933,7 @@
if (this.copyType == 1) {
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+ this.form.HDate = moment(date).format('YYYY-MM-DD')
} else {
if (data[0].HSourceInterID != "0") {
this.ifOrganizationEdit = true
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
index 11db684..abfe3b1 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
@@ -772,14 +772,14 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- axios.get(this.baseURL + "/Sc_MouldProdOutBill/DeltetMouldProdOutBill", {
- params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
+ axios.get(this.baseURL + "/Sc_MouldProdOutBillController/GetSc_MouldProdOutBill_Delete_Json", {
+ params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
}).then(response => {
if (response.data.count == 1) {
this.getList()
this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
--
Gitblit v1.9.1