This commit is contained in:
Vergil
2020-04-08 14:10:48 +08:00
parent 0d0e0dcb6f
commit 2aac78cda4
4 changed files with 33 additions and 9 deletions

View File

@@ -110,7 +110,7 @@ export function editData1(Number, manufacturers, freight, Explain) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间生产管理_外协加工任务单_修改数据',
param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=0&单据状态=2&入库标志=1&扣款说明=&扣款_质量=0&扣款_计划=0&扣款_其他=0'
param: '外协加工任务单流水号=' + Number + '&外协厂家=' + manufacturers + '&运费=0&单据状态=2&入库标志=1&扣款说明=&扣款_质量=0&扣款_计划=0&扣款_其他=0'
}
})
}
@@ -138,7 +138,7 @@ export function editData(Number, manufacturers, freight, Explain) {
ModularID: router.currentRoute.path,
type: '2',
name: '车间生产管理_外协加工任务单_修改数据',
param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&扣款说明=' + Explain
param: '外协加工任务单流水号=' + Number + '&外协厂家=' + manufacturers + '&运费=' + freight + '&扣款说明=' + Explain
}
})
}

View File

@@ -155,7 +155,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff1('form1')">取消</el-button>
<el-button type="primary" @click="submit1('form1')" >确定</el-button>
<el-button :disabled="handleAdd1_disable" type="primary" @click="submit1('form1')" >确定</el-button>
</div>
</el-dialog>
@@ -182,7 +182,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff2('form2')">取消</el-button>
<el-button type="primary" @click="submit2('form2')" >确定</el-button>
<el-button :disabled="handleAdd2_disable" type="primary" @click="submit2('form2')" >确定</el-button>
</div>
</el-dialog>
</div>
@@ -193,6 +193,8 @@ import { searchtable, getInvoice, getPayment, AddType1, AddType2, handleChange1,
export default {
data() {
return {
handleAdd1_disable: false,
handleAdd2_disable: false,
ManufacturerName: '', // 外协厂家
外协厂家流水号: '',
外协厂家流水号_Select: '',
@@ -318,6 +320,7 @@ export default {
this.form1.开票时间 = ''
this.form1.开票金额 = ''
this.form1.外协厂家 = ''
this.handleAdd1_disable = false
this.dialogFormVisible1 = true
} else {
this.$message.error('请先选择外协厂家')
@@ -325,6 +328,7 @@ export default {
},
// 增加确定
AddType1() {
this.handleAdd1_disable = true
AddType1(this.外协厂家流水号, this.form1.发票号, this.form1.开票时间, this.form1.开票金额).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息增加成功')
@@ -348,10 +352,12 @@ export default {
this.form1.发票号 = row.发票号
this.form1.开票时间 = row.开票时间
this.form1.开票金额 = row.开票金额
this.handleAdd1_disable = false
this.dialogFormVisible1 = true
},
// 编辑确定
handleChange1() {
this.handleAdd1_disable = true
handleChange1(this.id_edit1, this.form1.发票号, this.form1.开票时间, this.form1.开票金额).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息修改成功')
@@ -419,12 +425,14 @@ export default {
this.title2 = '新增付款'
this.form2.付款时间 = ''
this.form2.付款金额 = ''
this.handleAdd2_disable = false
this.dialogFormVisible2 = true
} else {
this.$message.error('请先选择外协厂家')
}
},
AddType2() {
this.handleAdd2_disable = true
AddType2(this.外协厂家流水号, this.form2.付款金额, this.form2.付款时间).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息增加成功')
@@ -446,10 +454,12 @@ export default {
this.title2 = '编辑到票'
this.form2.付款金额 = row.付款金额
this.form2.付款时间 = row.付款日期
this.handleAdd2_disable = false
this.dialogFormVisible2 = true
},
// 编辑确定
handleChange2() {
this.handleAdd2_disable = true
handleChange2(this.id_edit2, this.form2.付款金额, this.form2.付款时间).then(response => {
if (response.data[0].result === '1') {
this.$message.success('信息修改成功')

View File

@@ -144,7 +144,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="callOff('form')">取消</el-button>
<el-button type="primary" @click="submit('form')">确定</el-button>
<el-button :disabled="handleAdd_disable" type="primary" @click="submit('form')">确定</el-button>
</div>
</el-dialog>
</div>
@@ -161,6 +161,7 @@ export default {
},
data() {
return {
handleAdd_disable: false,
工艺计划流水号: [],
isChecked: false,
bianliang: [],
@@ -393,6 +394,7 @@ export default {
})
this.form.运费 = 0
this.form.外协厂家 = ''
this.handleAdd_disable = false
this.dialogFormVisible = true
},
// 编辑外协任务单
@@ -401,10 +403,9 @@ export default {
this.$refs['form'].resetFields()
}
this.title = '编辑外协任务单'
this.dialogFormVisible = true
this.form.表单号 = row.表单号
this.form.运费 = row.运费
this.form.外协厂家 = row.外协厂家
this.form.外协厂家 = parseInt(row.外协厂家流水号)
this.form.下达任务日期 = row.任务下达日期
this.ManufactorNumber1 = row.外协厂家流水号
this.Number = row.外协加工任务单流水号
@@ -416,6 +417,8 @@ export default {
} else {
this.documentStatus = 2
}
this.handleAdd_disable = false
this.dialogFormVisible = true
},
// 提交
submit(formName) {
@@ -441,6 +444,7 @@ export default {
this.form.运费 = ''
this.$message.error('请输入数字')
} else {
this.handleAdd_disable = true
addTable(this.form.表单号, this.id, this.form.外协厂家, this.form.下达任务日期, this.form.运费).then(response => {
if (response.data[0].result === '1') {
this.$notify({
@@ -453,6 +457,7 @@ export default {
this.fetchData()
this.dialogFormVisible = false
} else {
this.handleAdd_disable = false
this.$message.error('信息添加失败')
}
})
@@ -460,13 +465,17 @@ export default {
},
// 提交编辑
submitEdit() {
this.handleAdd_disable = true
editData(this.Number, this.form.外协厂家, this.form.运费, this.Explain).then(response => {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
this.dialogFormVisible = false
this.title = ''
this.fetchData()
} else { this.$message.error('编辑失败') }
} else {
this.handleAdd_disable = false
this.$message.error('编辑失败')
}
})
},
// 删除任务单

View File

@@ -58,7 +58,7 @@
</el-col>
<el-col style="width: auto">
<el-card>
<el-button size="small" type="success" plain style="margin: 10px" @click="saveRowPrice()">保存</el-button>
<el-button :disabled="saveRowPrice_disable" size="small" type="success" plain style="margin: 10px" @click="saveRowPrice()">保存</el-button>
<el-table v-loading="loading2" :data="tableData2" :row-class-name="tableData1ClassName" height="580" border element-loading-text="拼命加载中" size="small">
<el-table-column label="序号" type="index" align="center" width="50"/>
<el-table-column label="加工状态" width="100" align="center">
@@ -100,6 +100,7 @@ import { machine, getToolNum, getNum, searchTable, searchTable2, edit, edit2, sa
export default {
data() {
return {
saveRowPrice_disable: false,
entryNameValue: '',
entryName: [], // 项目名称
toolNumValue: '',
@@ -273,6 +274,7 @@ export default {
},
// 保存行价格
saveRowPrice() {
this.saveRowPrice_disable = true
this.count = 0
for (let i = 0; i < this.tableData2.length; i++) {
if (this.checkBox[i] === false) {
@@ -281,6 +283,7 @@ export default {
}
if (this.tableData2.length === 0) {
this.$message.error('请选择零件')
this.saveRowPrice_disable = false
} else {
if (this.count !== this.tableData2.length) {
this.a = 0
@@ -290,11 +293,13 @@ export default {
if (this.a === this.tableData2.length) {
this.$message.success('保存成功')
this.searchTable()
this.saveRowPrice_disable = false
}
})
}
} else {
this.$message.error('请选择需要外协工序')
this.saveRowPrice_disable = false
}
}
},