diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js
index 7ef8a0d..f6766cc 100644
--- a/src/api/sampleManagement/technicalSpecificationList.js
+++ b/src/api/sampleManagement/technicalSpecificationList.js
@@ -21,3 +21,5 @@ export const deleteBMBom= data => createAPI(`/technicalSpecification/deleteBMBom
export const searchBMRoutingDetail= data => createAPI(`/technicalSpecification/searchBMRoutingDetail`,'post',data)
export const updateBMRoutingDetail= data => createAPI(`/technicalSpecification/updateBMRoutingDetail`,'post',data)
export const searchBMPropertiesValue= data => createAPI(`/technicalSpecification/searchBMPropertiesValue`,'post',data)
+export const saveBMPropertiesValue= data => createAPI(`/technicalSpecification/saveBMPropertiesValue`,'post',data)
+export const refreshBMPageModal= data => createAPI(`/technicalSpecification/refreshBMPageModal`,'post',data)
diff --git a/src/views/modules/base/propertiesItem/bmPropertiesModel.vue b/src/views/modules/base/propertiesItem/bmPropertiesModel.vue
index a5e0904..2c36ede 100644
--- a/src/views/modules/base/propertiesItem/bmPropertiesModel.vue
+++ b/src/views/modules/base/propertiesItem/bmPropertiesModel.vue
@@ -95,6 +95,17 @@
border
v-loading="dataListLoading"
style="width: 100%;">
+
+
+ 上移
+ 下移
+
+
- 上移
- 下移
可选值
删除属性
diff --git a/src/views/modules/base/propertiesItem/propertiesItem.vue b/src/views/modules/base/propertiesItem/propertiesItem.vue
index 2125bdb..171c132 100644
--- a/src/views/modules/base/propertiesItem/propertiesItem.vue
+++ b/src/views/modules/base/propertiesItem/propertiesItem.vue
@@ -605,7 +605,7 @@
createdBy:this.$store.state.user.name,
maxValue:'',
minValue:'',
- itemType:'A',
+ itemType:this.searchData.itemType!=''?JSON.parse(JSON.stringify(this.searchData.itemType)):'A',
updateBy: this.$store.state.user.name,
};
this.modalDisableFlag = false;
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
index e201d30..03b3517 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
@@ -342,7 +342,7 @@
},
//初始化组件的参数
init(inData) {
- if(this.dataForm.codeNo!=null&&this.dataForm.codeNo!=''){
+ if(this.searchData.codeNo!=null&&this.searchData.codeNo!=''){
return false;
}
//初始化参数
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
similarity index 56%
rename from src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue
rename to src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
index 18c611c..dae7744 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
@@ -2,9 +2,9 @@
- 更新模板
+ 更新模板
刷新数据
- 新增
+ 保存数据
;width:98%">
- ;width:98%">
+ ;width:98%">
-
+
@@ -61,7 +61,9 @@
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
index e67b147..9843a3e 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
index 49af439..f388688 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
@@ -16,6 +16,9 @@
+
+
+
@@ -29,7 +32,8 @@
import packageInfo from "./com_bm_packageInfo";/*包装信息*/
import bom from "./com_bm_bom";/*BOM*/
import routing from "./com_bm_routing";/*工艺*/
- import prepress from "./com_bm_prepress";/*印前*/
+ import prepress from "./com_bm_demoSlot";/*印前*/
+ import technicalRequirement from "./com_bm_demoSlot";/*印前*/
export default {
name: "technicalSpecificationDetail",
components: {
@@ -39,6 +43,7 @@
bom,
routing,
prepress,
+ technicalRequirement,
},
data() {
return {
@@ -47,6 +52,7 @@
codeNo:'',
buNo:'',
username:this.$store.state.user.name,
+ type:'',
},
activeName:'baseInfo',
@@ -79,6 +85,10 @@
this.getBom();
}else if(this.activeName == 'routing'){
this.getRouting();
+ }else if(this.activeName == 'prepress'){
+ this.getPrepress();
+ }else if(this.activeName == 'technicalRequirement'){
+ this.getTechnicalRequirement();
}
},
getBaseInfoData(){
@@ -96,6 +106,14 @@
getRouting(){
this.$refs.routing.init(JSON.parse(JSON.stringify(this.dataForm)))
},
+ getPrepress(){
+ this.dataForm.type='prepress'
+ this.$refs.prepress.init(JSON.parse(JSON.stringify(this.dataForm)))
+ },
+ getTechnicalRequirement(){
+ this.dataForm.type='technicalRequirement'
+ this.$refs.technicalRequirement.init(JSON.parse(JSON.stringify(this.dataForm)))
+ },
},
}
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue
index 91c0639..50e930b 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue
@@ -333,7 +333,23 @@
status: true,
fixed: '',
columnWidth: 80
-
+ },{
+ userId: this.$store.state.user.name,
+ functionId: 103002,
+ serialNumber: '103002Table1BuNo',
+ tableId: "103002Table1",
+ tableName: "技术参数卡列表",
+ columnProp: "buNo",
+ headerAlign: "center",
+ align: "left",
+ columnLabel: "部门编号",
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 60
},{
userId: this.$store.state.user.name,
functionId: 103002,