diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue
index 50c4c7f8..602840bf 100644
--- a/src/views/Assembly/AssemblyQualityInspection/index.vue
+++ b/src/views/Assembly/AssemblyQualityInspection/index.vue
@@ -12,21 +12,21 @@
{{ item.name }}
-
+
-
+
-
+
-
+
{{ scope.row.组件名称 }}
@@ -78,6 +78,16 @@
{{ scope.row.检测项明细 }}
+
+
+ {{ scope.row.质检时间 }}
+
+
+
+
+ {{ scope.row.姓名 }}
+
+
{{ scope.row.备注 }}
@@ -109,7 +119,7 @@ export default {
groupNumber: [],
TestValue: '',
Test: [],
- qualityInspectionValue: '',
+ qualityInspectionValue: 2,
qualityInspection: [
{
value: 1,
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index 382e5867..c176ac3e 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -19,7 +19,7 @@
:label="item.label"
:value="item.value"/>
-
+
-
-
-
+
已禁用
-
+
{{ scope.row.机床图号 }}
@@ -90,7 +88,7 @@
{{ scope.row.组号 }}
-
+
{{ scope.row.零件图号 }}
@@ -100,12 +98,12 @@
{{ scope.row.零件名称 }}
-
+
{{ scope.row.零件数量 }}
-
+
{{ scope.row.规格或材料 }}
@@ -115,22 +113,22 @@
{{ scope.row.工艺名称 }}
-
-
- {{ scope.row.质检类型 }}
-
-
+
+
+
+
+
{{ scope.row.姓名 }}
-
+
{{ scope.row.数量 }}
-
+
{{ scope.row.不合格数量 }}
@@ -155,7 +153,7 @@
{{ scope.row.备注 }}
-
+
- 形位
+ 形位
-
+
- 尺寸
+ 尺寸
-
+
- 外观
+ 外观
-
+
查看图片
@@ -256,7 +254,7 @@
正在加工零件列表
-
+
{{ scope.row.机床图号 }}
@@ -471,7 +469,7 @@ export default {
gridData: [],
QualityTypeNumber: [],
QualityTypeValue: '',
- qualityInspectionValue: '',
+ qualityInspectionValue: 1,
qualityInspection: [
{
value: 1,
diff --git a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
index de58c121..0b550149 100644
--- a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
+++ b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
@@ -28,7 +28,7 @@
:label="item.label"
:value="item.value"/>
- 查询
+ 查询
diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue
index f7a8ec02..33790659 100644
--- a/src/views/ManufacturingCenter/InventoryQuery/index.vue
+++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue
@@ -6,7 +6,7 @@
- 查询
+ 查询
diff --git a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
index f56a6752..d36cfbf7 100644
--- a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
+++ b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
@@ -25,7 +25,7 @@
:value="item.value"/>
- 查询
+ 查询
@@ -131,7 +131,6 @@
element-loading-background="rgba(226,223,223,1)"
height="600"
border
- stripe
style="width: 510px">
开始工序
- 补投重新生产零件
+ 补投重新生产零件
diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index ebb621c9..9f2e46c1 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -3,9 +3,11 @@
设备名称:
- 查询
+
+ 查询
- 新增
+ 新增
+
有效时间:
- 设定
+
+ 设定
- 生成设备加工能力
+
+ 生成设备加工能力
@@ -74,10 +78,10 @@
{{ scope.row.设备预留工时系数 }}
-
+
- 编辑
- 删除
+
+
@@ -336,6 +340,13 @@ export default {
}
})
},
+ ADD() {
+ this.addForm('form')
+ this.dialogFormVisible1 = true
+ this.form.contractSigningDate = getNowTime()// new Date()
+ this.temp = 1
+ this.title = '新增项目'
+ },
submitEdit() {
editTable(this.equipmentSerialNumber, this.form.设备名称, this.form.设备型号, this.form.设备性能指标, this.form.设备加工能力, this.form.设备工时系数, this.form.班次类型, this.form.设备加工工艺, this.form.整改工时系数, this.form.设备编号, this.form.预留工时系数).then(response => {
if (response.data[0].result === '1') {
@@ -423,3 +434,20 @@ export default {
/* color: #ff9759;*/
/*}*/
+
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index ecab7e45..dceca54c 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -177,10 +177,10 @@
增加机床
+ size="mini"
+ type="text"
+ icon="el-icon-circle-plus-outline"
+ @click.stop="addMachine(scope.row);flag = 1">增加机床
- 查询
+
+ 查询
- 新增
+ 新增
+
@@ -83,14 +85,19 @@
-
- 机床
-
+
+
+
+
+
+
+
+
+ 增加机床
-