diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index db98467d..595f97a0 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -51,39 +51,38 @@
未分配
-
-
-
- {{ scope.row.零件名称 }}
-
-
-
-
-
- {{ scope.row.零件图号 }}
-
-
-
-
- {{ scope.row.批次数量 }}
-
-
-
-
- {{ scope.row.材料 }}
-
-
-
-
- {{ scope.row.重量 }}
-
-
-
-
- {{ scope.row.工艺要求 }}
-
-
-
+
+
+ {{ scope.row.零件名称 }}
+
+
+
+
+
+ {{ scope.row.零件图号 }}
+
+
+
+
+ {{ scope.row.批次数量 }}
+
+
+
+
+ {{ scope.row.材料 }}
+
+
+
+
+ {{ scope.row.重量 }}
+
+
+
+
+ {{ scope.row.工艺要求 }}
+
+
+
{
- searchtable(this.partNamecheck, this.partName, !this.all, 0, this.pageCurrent, this.pageSize).then(response => {
- console.log(response)
- if (response.data.total === 0) {
- this.loading = false
- } else {
+ if (response.data.total === 0) {
+ this.loading = false
+ } else {
// this.tableData.push({
// 重量: response.data.rows[0].重量
// })
- this.Data = response.data.rows
- this.total = response.data.total
- }
- }).then(() => {
- for (let i = 0; i < this.Data.length; i++) {
- searchtable2(this.Data[i].工艺计划流水号).then(response => {
- this.tableData.push({
- 工艺计划流水号: this.Data[i].工艺计划流水号,
- 零件名称: this.Data[i].零件名称,
- 零件图号: this.Data[i].零件图号,
- 备料打印: this.Data[i].备料打印,
- 是否外购备料: this.Data[i].是否外购备料,
- 工艺要求: response.data[0].工艺要求,
- 材料: this.Data[i].材料,
- 重量: this.Data[i].重量,
- 批次数量: this.Data[i].批次数量
- })
+ this.Data = response.data.rows
+ this.total = response.data.total
+ }
+ }).then(() => {
+ for (let i = 0; i < this.Data.length; i++) {
+ searchtable2(this.Data[i].工艺计划流水号).then(response => {
+ this.tableData.push({
+ 工艺计划流水号: this.Data[i].工艺计划流水号,
+ 零件名称: this.Data[i].零件名称,
+ 零件图号: this.Data[i].零件图号,
+ 备料打印: this.Data[i].备料打印,
+ 是否外购备料: this.Data[i].是否外购备料,
+ 工艺要求: response.data[0].工艺要求,
+ 材料: this.Data[i].材料,
+ 重量: this.Data[i].重量,
+ 批次数量: this.Data[i].批次数量
})
- this.loading = false
- }
- })
+ })
+ this.loading = false
+ }
})
},
handleSelectionChange(val) {
diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index 47c31da1..167de33f 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -43,7 +43,11 @@
新增
+<<<<<<< HEAD
+=======
+
+>>>>>>> d828757fc0d137c09d0339446a35ae8651355ce7
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index 2e4839f4..ada8a541 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -4,7 +4,7 @@
零件号:
查询
- 打回车间
+ 打回车间
计算价格-->
选入零件
- 导出单据
+ 导出任务单
- 成交
+ 提交
保存
-
+
{{ 零件图号[scope.$index] }}
@@ -205,13 +205,13 @@
- 移除
+ 移出
-
+
@@ -315,7 +315,7 @@
-
+
@@ -682,9 +682,9 @@ export default {
submit(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
- if (this.title === '增加外协表单') {
+ if (this.title === '新增外协任务单') {
this.submitAdd()
- } else if (this.title === '编辑外协表单') {
+ } else if (this.title === '编辑外协任务单') {
this.submitEdit()
}
}
@@ -694,7 +694,7 @@ export default {
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
- this.title = '增加外协表单'
+ this.title = '新增外协任务单'
var time = new Date()
var month = time.getMonth() + 1
var day = time.getDate()
@@ -1145,7 +1145,7 @@ export default {
if (this.$refs['form'] !== undefined) {
this.$refs['form'].resetFields()
}
- this.title = '编辑外协表单'
+ this.title = '编辑外协任务单'
this.dialogFormVisible = true
this.form.表单号 = row.表单号
this.form.运费 = row.运费
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index 2eb8064b..50180b33 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -20,13 +20,8 @@
:value="item.value"/>
- 查询
+ 查询
-
{{ scope.row.零件图号 }}
@@ -42,11 +37,6 @@
{{ scope.row.材料 }}
-
-
-
-
-
{{ scope.row.批次数量 }}
@@ -68,7 +58,7 @@
- 保存
+ 保存
@@ -84,12 +74,6 @@
-
-
-
-
-
-
{{ scope.row.工艺名称 }}
@@ -125,6 +109,7 @@ export default {
count: 0, // 计数器 (表二是否有外协工序)
InOut: 1, // 工序间是否外协变量 1自家 2外协
index: 0, // 当前点击行（改变颜色不刷新用）
+ index2: 0, // 当前点击行（改变颜色不刷新用）
num1: '',
checkBox: [],
loading1: false,
@@ -217,6 +202,7 @@ export default {
this.loading2 = true
this.checkBox = []
this.tableData2 = []
+ this.index2 = row.index
searchTable2(row.工艺计划流水号).then(response => {
this.num1 = row.工艺计划流水号
if (response.data.length === 0) {
@@ -265,63 +251,14 @@ export default {
this.InOut = 2
edit(row.工序流水号, this.InOut).then(response => {
edit2(row.工序流水号, row.工艺计划流水号, 1).then(response => {
- this.$message.success('工序外协状态更改成功')
this.tableData2[this.index].工序间是否外协 = 2
- // this.loading2 = true
- // this.checkBox = []
- // this.tableData2 = []
- // searchTable2(this.num1).then(response => {
- // if (response.data.length === 0) {
- // this.loading0 = false
- // } else {
- // for (let i = 0; i < response.data.length; i++) {
- // if (response.data[i].工序间是否外协 === 1) {
- // this.checkBox.push(false)
- // } else {
- // this.checkBox.push(true)
- // }
- // }
- // for (let i = 0; i < response.data.length; i++) {
- // response.data[i].机加工开始时间 = response.data[i].机加工开始时间.split(' ')[0]
- // response.data[i].机加工结束时间 = response.data[i].机加工结束时间.split(' ')[0]
- // response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
- // }
- // this.tableData2 = response.data
- // }
- // }).then(() => {
- // this.loading2 = false
- // })
+ this.tableData1[this.index2].工序间是否外协 = 2
})
})
} else {
this.InOut = 1
edit(row.工序流水号, this.InOut).then(response => {
- this.$message.success('工序外协状态更改成功')
this.tableData2[this.index].工序间是否外协 = 1
- // this.loading2 = true
- // this.checkBox = []
- // this.tableData2 = []
- // searchTable2(this.num1).then(response => {
- // if (response.data.length === 0) {
- // this.loading0 = false
- // } else {
- // for (let i = 0; i < response.data.length; i++) {
- // if (response.data[i].工序间是否外协 === 1) {
- // this.checkBox.push(false)
- // } else {
- // this.checkBox.push(true)
- // }
- // }
- // for (let i = 0; i < response.data.length; i++) {
- // response.data[i].机加工开始时间 = response.data[i].机加工开始时间.split(' ')[0]
- // response.data[i].机加工结束时间 = response.data[i].机加工结束时间.split(' ')[0]
- // response.data[i].计划日期 = response.data[i].计划日期.split(' ')[0]
- // }
- // this.tableData2 = response.data
- // }
- // }).then(() => {
- // this.loading2 = false
- // })
})
}
},
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 05fdda97..58c26498 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -1,6 +1,6 @@
-
+
请款时间段:
请款
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{ scope.row.供应商名称 }}
@@ -78,51 +80,47 @@
{{ scope.row.姓名 }}
-
-
- {{ scope.row.请款时间 | formatTime }}
-
-
-
-
- {{ parseFloat(scope.row.请款金额).toFixed(2) }}
-
-
-
-
- 未审批
- 已通过
- 不通过
- {{ parseFloat(scope.row.请款金额).toFixed(2) }}
-
-
-
-
- {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
-
-
-
-
- 未操作
- 已同意
- 不同意
-
-
-
-
- {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ parseFloat(scope.row.请款金额).toFixed(2) }}
+
+
+
+
+ 未审批
+ 已通过
+ 不通过
+
+
+
+
+ {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
+
+
+
+
+ 未操作
+ 已同意
+ 不同意
+
+
+
+
+ {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
+
+
+
+
+
+
+
+
+
+
+
+
-
+