From d9c6f2edf27bf540f7729f3e399c0dc4e2d886f8 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 07 四月 2026 15:36:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue | 4
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue | 4
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue | 4
src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue | 4
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue | 4
src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue | 4
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue | 4
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue | 4
RuoYi-Vue | 1
src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue | 49 ++++++++++-----
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue | 4
src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue | 32 +++++-----
src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue | 4
13 files changed, 69 insertions(+), 53 deletions(-)
diff --git a/RuoYi-Vue b/RuoYi-Vue
new file mode 160000
index 0000000..8a1cf9e
--- /dev/null
+++ b/RuoYi-Vue
@@ -0,0 +1 @@
+Subproject commit 8a1cf9ed55747229ce4149ddacf8596fa0995814
diff --git a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
index 6d6d26d..a5a7ca3 100644
--- a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
+++ b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
@@ -3,7 +3,7 @@
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
<el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button>
<el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
- <el-button type="primary" @click="set_CheckBill(0, form)">瀹� 鏍�</el-button>
+ <!-- <el-button type="primary" @click="set_CheckBill(0, form)">瀹� 鏍�</el-button> -->
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
@@ -265,31 +265,31 @@
<span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="HUnitID" width="120">
+ <!-- <el-table-column align="center" label="HUnitID" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HUnitID }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
<template slot-scope="scope">
<span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="HPropertyID" width="120">
+ <!-- <el-table-column align="center" label="HPropertyID" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HPropertyID }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column align="center" label="杈呭姪灞炴��" width="120">
<template slot-scope="scope">
<span>{{ scope.row.杈呭姪灞炴�� }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="鎹㈢畻鐜�" width="120">
+ <!-- <el-table-column align="center" label="鎹㈢畻鐜�" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HSecUnitRate }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column align="center" label="搴斿彂鏁伴噺" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HQtyMust }}</span>
@@ -307,7 +307,7 @@
controls-position="right"></el-input-number>
</template>
</el-table-column>
- <el-table-column align="center" label="鍗曚环" width="140">
+ <!-- <el-table-column align="center" label="鍗曚环" width="140">
<template slot-scope="scope">
<el-input-number v-model="scope.row.HPrice" :min="0" style="width: 120px;"
controls-position="right"></el-input-number>
@@ -328,7 +328,7 @@
<template slot-scope="scope">
<span>{{scope.row.HOutMoney = scope.row.HOutPrice * scope.row.HQty }}</span>
</template>
- </el-table-column>
+ </el-table-column>-->
<el-table-column align="center" label="HWHID" width="120">
<template slot-scope="scope">
<span>{{scope.row.HWHID}}</span>
@@ -571,12 +571,12 @@
HSecManagerName: "",
HKeeperID: 0,
HKeeperName: "",
- HDeptID: 0,
- HDeptName: "",
+ HDeptID: sessionStorage["HDeptID"],
+ HDeptName: sessionStorage["HDept"],
HManagerID: 0,
HMangerName: "",
- HEmpID: 0,
- HEmpName: "",
+ HEmpID: sessionStorage["HEmpID"],
+ HEmpName: sessionStorage["HEmpName"],
HSourceBillType: "",
HExplanation :"",
HRemark: "",
@@ -834,6 +834,8 @@
this.gySupplierShow = true
this.openData = true
} else if (num == 9) {
+ this.openPageData.HWHName = ''
+ this.$nextTick()
if(this.HSPType==1){
if(this.editData[this.zbIndex].HWHName){
this.dialogTitle = '浠撲綅鍒楄〃'
@@ -871,6 +873,7 @@
this.gyEmployeeShow = false
this.gySupplierShow = false
this.Kf_MoveStockRequestBillShow = false
+ this.gyStockPlaceShow = false
},
//#endregion
//#endregion
@@ -887,28 +890,40 @@
this.form.HWHName = deptRow.浠撳簱鍚嶇О
this.form.HWHID = deptRow.HItemID
this.form.HWHNumber = deptRow.浠撳簱浠ｇ爜
+ this.form.HSPID = 1
+ this.form.HSPName = ''
for (let i = 0; i < this.editData.length; i++) {
this.editData[i].HWHID = deptRow.HItemID
this.editData[i].HWHNumber = deptRow.浠撳簱浠ｇ爜
this.editData[i].HWHName = deptRow.浠撳簱鍚嶇О
+ this.editData[i].HSPID = 1
+ this.editData[i].HSPName = ''
}
}else if(this.eHWHType == 2){
this.form.HSCWHName = deptRow.浠撳簱鍚嶇О
this.form.HSCWHID = deptRow.HItemID
this.form.HSCWHNumber = deptRow.浠撳簱浠ｇ爜
+ this.form.HSCSPID = 1
+ this.form.HSCSPName = ''
for (let i = 0; i < this.editData.length; i++) {
this.editData[i].HSCWHID = deptRow.HItemID
this.editData[i].HSCWHNumber = deptRow.浠撳簱浠ｇ爜
this.editData[i].HSCWHName = deptRow.浠撳簱鍚嶇О
+ this.editData[i].HSCSPID = 1
+ this.editData[i].HSCSPName = ''
}
}else if(this.eHWHType == 3){
this.editData[this.zbIndex].HWHID = deptRow.HItemID
this.editData[this.zbIndex].HWHNumber = deptRow.浠撳簱浠ｇ爜
this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
+ this.editData[this.zbIndex].HSPID = 1
+ this.editData[this.zbIndex].HSPName = ''
}else if(this.eHWHType == 4){
this.editData[this.zbIndex].HSCWHID = deptRow.HItemID
this.editData[this.zbIndex].HSCWHNumber = deptRow.浠撳簱浠ｇ爜
this.editData[this.zbIndex].HSCWHName = deptRow.浠撳簱鍚嶇О
+ this.editData[this.zbIndex].HSCSPID = 1
+ this.editData[this.zbIndex].HSCSPName = ''
}
this.warehouseShow = false
this.openData = false
@@ -1058,7 +1073,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); //瀹℃牳
@@ -1129,8 +1144,8 @@
瑙勬牸鍨嬪彿: '',
HUnitID: 0,
璁￠噺鍗曚綅: '',
- HQtyMust: 1,
- HQty: 1,
+ HQtyMust: 0,
+ HQty: 0,
HPieceQty: 0,
HPrice: 0,
HTaxPrice: 0,
@@ -1140,7 +1155,7 @@
HWHID: 0,
鍙戣揣浠撳簱: '',
HRemark: '',
- HQty_Full: 0,
+ HQty_Full:0,
HQty_Empty: 0,
HQty_Back: 0,
HCostPrice: 0,
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
index 74eca8d..04ecc87 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -3,7 +3,7 @@
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
<!-- <el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button> -->
<el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button>
+ <!-- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button> -->
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
@@ -14,7 +14,7 @@
<el-row>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍗曟嵁鍙�" prop="HBillNo">
- <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
index 415afb9..19f34cf 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -3,7 +3,7 @@
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
<!-- <el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button> -->
<el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button>
+ <!-- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button> -->
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
@@ -14,7 +14,7 @@
<el-row>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍗曟嵁鍙�" prop="HBillNo">
- <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
index 6c4c68e..79b1239 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.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>
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
index fa78168..8d482d6 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
@@ -3,7 +3,7 @@
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
<!-- <el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button> -->
<el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button>
+ <!-- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button> -->
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
@@ -13,8 +13,8 @@
<el-tab-pane label="鍩烘湰淇℃伅" name="first">
<el-row>
<el-col :span="6">
- <el-form-item v-show="HIsShow" label="鍗曟嵁鍙�" prop="HBillNo">
- <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ <el-form-item v-show="HIsShow" label="鍗曟嵁鍙�" prop="HBillNo" >
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -105,21 +105,21 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item v-show="HIsShow" 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>
</el-select>
</el-form-item>
- </el-col>
- <el-col :span="6">
+ </el-col> -->
+ <!-- <el-col :span="6">
<el-form-item v-show="HIsShow" label="婧愬崟鍗曞彿" prop="HSourceBillNo">
<el-input placeholder="璇烽�夋嫨婧愬崟鍗曞彿" disabled>
<el-button slot="append" icon="el-icon-search" @click="get_checkMainSource()"></el-button>
</el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
<el-col :span="12">
@@ -431,15 +431,15 @@
HBillSubType: [
{ required: true, message: "瀛愬崟鎹被鍨嬩笉鑳戒负绌�", trigger: "blur" }
],
- HEmpName: [
- { required: true, message: "涓氬姟鍛樹笉鑳戒负绌�", trigger: "blur" }
- ],
- HSecManagerName: [
- { required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
- ],
- HKeeperName: [
- { required: true, message: "淇濈鍛樹笉鑳戒负绌�", trigger: "blur" }
- ]
+ // HEmpName: [
+ // { required: true, message: "涓氬姟鍛樹笉鑳戒负绌�", trigger: "blur" }
+ // ],
+ // HSecManagerName: [
+ // { required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
+ // ],
+ // HKeeperName: [
+ // { required: true, message: "淇濈鍛樹笉鑳戒负绌�", trigger: "blur" }
+ // ]
}
};
},
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
index 119e219..a383e45 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
@@ -135,10 +135,10 @@
<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-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>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
index bd1c049..636095f 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -3,7 +3,7 @@
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
<el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button>
<el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button>
+ <!-- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button> -->
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
@@ -14,7 +14,7 @@
<el-row>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍗曟嵁鍙�" prop="HBillNo">
- <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
index 0c12431..0fd6e4c 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
@@ -135,10 +135,10 @@
<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-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-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
</el-button>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
index 6aedf1b..52a7e79 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -3,7 +3,7 @@
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
<el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button>
<el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button>
+ <!-- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button> -->
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
@@ -14,7 +14,7 @@
<el-row>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍗曟嵁鍙�" prop="HBillNo">
- <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
index 1ec9039..b44515c 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.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-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
</el-button>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
index dc06039..4be62bc 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -3,7 +3,7 @@
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
<el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button>
<el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button>
+ <!-- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button> -->
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
@@ -14,7 +14,7 @@
<el-row>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍗曟嵁鍙�" prop="HBillNo">
- <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
+ <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
index 8874e31..642a6ed 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
@@ -135,10 +135,10 @@
<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-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-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
</el-button>
--
Gitblit v1.9.1