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 8a1bb6f..eb725b4 100644
--- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue
+++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
@@ -6,21 +6,22 @@
:close-on-click-modal="false"
:visible.sync="visible">
-
+
打样单号
-
-
+
+ 项目料号
+
-
-
+
+
@@ -148,7 +149,7 @@
label="测试料号">
0){
row=data.rows[0]
@@ -409,13 +411,13 @@
this.dataForm.proofingNo=row.proofingNo
this.dataForm.projectId=row.projectId
this.dataForm.testPartNo=row.testPartNo
- this.dataForm.partName=row.partName
+ this.dataForm.partDesc=row.partDesc
this.proofingModelFlag=false
},
changeProofingNo(row){
this.dataForm.projectId=row.projectId
this.dataForm.testPartNo=row.testPartNo
- this.dataForm.partName=row.partName
+ this.dataForm.partDesc=row.partDesc
this.proofingModelFlag=false
},
quotationOfficerChooseModal(){
@@ -490,6 +492,18 @@
// 表单提交
dataFormSubmit () {
+ if(this.dataForm.testPartNo===''){
+ this.$alert('请输入测试料号！', '错误', {
+ confirmButtonText: '确定'
+ })
+ return false
+ }
+ if(this.dataForm.revNo===''){
+ this.$alert('请输入版本号！', '错误', {
+ confirmButtonText: '确定'
+ })
+ return false
+ }
saveTechnicalSpecificationSheet(this.dataForm).then(({data}) => {
if (data && data.code === 0) {
this.$message.success( '操作成功')
@@ -502,6 +516,7 @@
},
changeTestDesc(){
+ this.dataForm.proofingNo="";
let inData={
site:this.$store.state.user.site,
testPartNo: this.dataForm.testPartNo
@@ -510,14 +525,33 @@
if (data && data.code === 0) {
if(data.row!=null){
this.dataForm.projectId=data.row.projectId
- this.dataForm.partName=data.row.partName
+ this.dataForm.partDesc=data.row.partDesc
}else {
this.dataForm.projectId=''
- this.dataForm.partName=''
+ this.dataForm.partDesc=''
}
+
}
})
},
+ // changeTestPartNo(){
+ // let inData={
+ // site:this.dataForm.site,
+ // username:this.$store.state.user.name,
+ // testPartNo:this.dataForm.testPartNo,
+ // }
+ // getTestPartChangeData(inData).then(({data}) => {
+ // let row={
+ // projectId:'',
+ // testPartNo:'',
+ // partDesc:'',
+ // }
+ // if(data.rows.length>0){
+ // row=data.rows[0]
+ // }
+ // this.changeProofingNo(row)
+ // })
+ // },
},
}
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkMixing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkMixing.vue
new file mode 100644
index 0000000..5e02fb1
--- /dev/null
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_inkMixing.vue
@@ -0,0 +1,402 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 刷新
+ 新增
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 取消
+
+
+
+
+
-
-
+
+
-
-
+
+
@@ -31,6 +31,9 @@
+
+
+
@@ -46,6 +49,9 @@
+
+
+
@@ -105,6 +111,7 @@
import cqeComfirm from "./com_bm_demoSlot";/*组件*/
import tpInfo from "./com_bm_tpInfo";/*组件*/
import printOther from "./com_bm_printOther";/*组件*/
+ import InkMixing from "./com_bm_inkMixing";/*组件*/
export default {
name: "technicalSpecificationDetail",
components: {
@@ -132,6 +139,7 @@
cqeComfirm,
tpInfo,
printOther,
+ InkMixing,
},
data() {
return {
@@ -143,7 +151,7 @@
type:'',
},
pageRole:'',
- activeName:'baseInfo',
+ activeName:'',
}
},
@@ -159,7 +167,6 @@
this.$nextTick(() => {
this.changeHeightAuto();
this.getBaseInfoData();
- this.refreshCurrentTabTable()
})
},
methods: {
@@ -219,6 +226,9 @@
}else if(this.activeName == 'printOther'){
this.getPrintOther();
}
+ else if(this.activeName == 'InkMixing'){
+ this.getInkMixing();
+ }
},
getPrintOther(){
@@ -312,8 +322,10 @@
this.dataForm.type='tpInfo'
this.$refs.tpInfo.init(JSON.parse(JSON.stringify(this.dataForm)))
},
-
-
+ getInkMixing(){
+ this.dataForm.type='InkMixing'
+ this.$refs.InkMixing.init(JSON.parse(JSON.stringify(this.dataForm)))
+ },
//看有没有这个页面的权限
getPageRole(){
@@ -330,7 +342,7 @@
changeHeight(height){
var tabsElement = document.querySelector('.tabs');
// tabsElement.style.minHeight = window.innerHeight+'px';
- tabsElement.style.minHeight =height +'px';
+ tabsElement.style.minHeight = height +'px';
},
changeHeightAuto(){
//页签大小铺满网页
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue
index 50e930b..4bc0814 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue
@@ -478,7 +478,7 @@
columnProp: "partDesc",
headerAlign: "center",
align: "left",
- columnLabel: "物料名称",
+ columnLabel: "物料描述",
columnHidden: false,
columnImage: false,
columnSortable: false,