diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
index 8a895b4..e7f3dba 100644
--- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue
+++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
@@ -132,7 +132,7 @@
prop="proofingNo"
header-align="center"
align="left"
- min-width="40"
+ min-width="120"
style="font-size: 20px"
label="打样单">
@@ -140,24 +140,46 @@
prop="projectId"
header-align="center"
align="left"
- min-width="40"
+ min-width="120"
style="font-size: 20px"
label="项目号">
+
+
+
+
+
+
@@ -184,7 +206,7 @@
},
data () {
return {
- jumpFlag:false,
+ jumpFlag:true,
tagNo:'',
tagNo1:'',
visible: false,
@@ -320,7 +342,7 @@
}
},
init (id) {
- this.jumpFlag=false
+ this.jumpFlag=true
this.dataForm.id = id || 0
if(this.dataForm.id!=0){
let inData={
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
index d491c72..650c159 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
@@ -270,7 +270,7 @@
serialNumber: '104002Table2PrintUnitName',
tableId: '104002Table2',
tableName: 'BOM子物料表',
- columnProp: 'printUnitName',
+ columnProp: 'printUnit',
headerAlign: 'center',
align: 'center',
columnLabel: '单位',
@@ -288,7 +288,7 @@
serialNumber: '104002Table2IssueType',
tableId: '104002Table2',
tableName: 'BOM子物料表',
- columnProp: 'issueTypeName',
+ columnProp: 'issueType',
headerAlign: 'center',
align: 'center',
columnLabel: '生产属性',
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
index 74cc62b..a74a650 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
@@ -593,7 +593,7 @@
columnProp: 'machRunFactor',
headerAlign: 'center',
align: 'right',
- columnLabel: '机器运行速度',
+ columnLabel: '机器单位产出',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -611,7 +611,7 @@
columnProp: 'machSetupTime',
headerAlign: 'center',
align: 'right',
- columnLabel: '机器调机时长',
+ columnLabel: '机器调机时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -629,7 +629,7 @@
columnProp: 'runTimeCode',
headerAlign: 'center',
align: 'center',
- columnLabel: '时长单位',
+ columnLabel: '产出单位',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -647,7 +647,7 @@
columnProp: 'laborRunFactor',
headerAlign: 'center',
align: 'right',
- columnLabel: '人工生产速度',
+ columnLabel: '人工单位产出',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -665,7 +665,7 @@
columnProp: 'laborSetupTime',
headerAlign: 'center',
align: 'right',
- columnLabel: '人工调机时长',
+ columnLabel: '人工调机时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
@@ -791,7 +791,7 @@
columnProp: 'setupLaborClassDesc',
headerAlign: 'center',
align: 'center',
- columnLabel: '调机时人员等级',
+ columnLabel: '调机过程中人员等级',
columnHidden: false,
columnImage: false,
columnSortable: false,
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
index 73846b0..9b52403 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
@@ -19,21 +19,24 @@
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
@@ -44,9 +47,6 @@
-
-
-