From 55ce32d235e02d20df64f444d8d07c1d37eaa6a0 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 5 Feb 2020 10:59:16 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=BA=8F=E9=97=B4=E5=A4=96=E5=8D=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Outsourcing/PreorderAssociation/index.vue | 73 ++-----------------
1 file changed, 5 insertions(+), 68 deletions(-)
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
- // })
})
}
},
From b1baffd8ddf74bc437b327a55a0c2a6c15178408 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 5 Feb 2020 11:00:25 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=87=AA=E5=AE=B6?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=80=E4=B8=AA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/MarketingCenter/CreateProject/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index 4201b2bf..9b019d97 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -43,7 +43,7 @@
新增
-
+
From 8487abecf2d7cd894f2732a4a14c0ba75e86a0f6 Mon Sep 17 00:00:00 2001
From: jiangfuzhuang
Date: Wed, 5 Feb 2020 11:29:03 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E8=AE=BE=E5=A4=87?=
=?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../WorkshopEquipmentManagement.js | 4 +-
.../WorkshopEquipmentManagement/index.vue | 83 ++++++++++++-------
.../MarketingCenter/CreateProject/index.vue | 36 ++++----
3 files changed, 73 insertions(+), 50 deletions(-)
diff --git a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
index 470c27a3..428d589e 100644
--- a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
+++ b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
@@ -7,8 +7,8 @@ export function getData(check, equipmentName, pageCurrent, pageSize) {
data: {
type: '1',
name: '设备管理_设备加工能力_查询数据_设备维护NEW',
- param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName,
- pagination: pageCurrent + '&' + pageSize
+ param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName
+ // pagination: pageCurrent + '&' + pageSize
}
})
}
diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index 98f8ef2d..ebb621c9 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -3,14 +3,27 @@
设备名称:
- 查询
+ 查询
- 新增
+ 新增
+
+ 有效时间：
+
+
+ 设定
+
+
+ 生成设备加工能力
-
+
{{ scope.row.设备名称 }}
@@ -68,32 +81,32 @@
-
-
-
-
-
- 有效时间：
-
-
- 设定
-
-
- 生成设备加工能力
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -240,8 +253,8 @@ export default {
this.check = 0
}
getData(this.check, this.equipmentName, this.pageCurrent, this.pageSize).then(response => {
- this.List = response.data.rows
- this.total = response.data.total
+ this.List = response.data
+ // this.total = response.data.total
})
},
initialization() {
@@ -399,4 +412,14 @@ export default {
.el-card{
margin-bottom: 1px;
}
+ /*.el-button--success {*/
+ /* background: #ecf5ff;*/
+ /* border-color: #2d72d5;*/
+ /* color: #2d72d5;*/
+ /*}*/
+ /*.el-button--primary {*/
+ /* background: #fdf6ec;*/
+ /* border-color: #ff9759;*/
+ /* color: #ff9759;*/
+ /*}*/
diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index 4201b2bf..47c31da1 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -39,11 +39,11 @@
- 查询
+ 查询
- 新增
+ 新增
-
+
@@ -456,21 +456,21 @@ export default {