diff --git a/src/views/modules/part/bomManagement.vue b/src/views/modules/part/bomManagement.vue
index 959004b..40c9e03 100644
--- a/src/views/modules/part/bomManagement.vue
+++ b/src/views/modules/part/bomManagement.vue
@@ -4180,7 +4180,6 @@ export default {
this.alternativeChange()
}
})
- }).catch(() => {
})
},
@@ -4209,7 +4208,6 @@ export default {
this.alternativeChange()
}
})
- }).catch(() => {
})
},
diff --git a/src/views/modules/part/partCatalogInformation.vue b/src/views/modules/part/partCatalogInformation.vue
index 71c182a..f802015 100644
--- a/src/views/modules/part/partCatalogInformation.vue
+++ b/src/views/modules/part/partCatalogInformation.vue
@@ -1427,8 +1427,8 @@
conditionCodeUsageDb: '',
multilevelTrackingDb: '',
allowAsNotConsumedDb: '',
- lotTrackingCode: 'Not Lot Tracking',
- lotQuantityRule: 'One Lot Per Production Order',
+ lotTrackingCode: 'Order Based',
+ lotQuantityRule: 'Many Lots Per Production Order',
subLotRule: 'No Sub Lots Allowed',
componentLotRule: 'Many Lots Allowed',
createBy: this.$store.state.user.name,
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue
index 9d54ad4..6ca9310 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue
@@ -1001,7 +1001,7 @@
this.dataListLoading = false
})
}
- }else if (this.$route.params.type === 'test'){
+ } else if (this.$route.params.type === 'test') {
this.searchData.buNo = this.$route.params.buNo
this.searchData.testPartNo = this.$route.params.testPartNo
this.search();
@@ -1009,17 +1009,17 @@
this.searchData.buNo = '';
this.searchData.testPartNo = '';
}, 200)
- }else if (this.$route.params.codeNo){
+ } else if (this.$route.params.codeNo) {
this.searchData.oriCodeNo = this.$route.params.codeNo;
this.search();
setTimeout(() => {
this.searchData.oriCodeNo = '';
}, 200)
- }else if (this.$route.params.nowCodeNo){
- this.searchData.codeNo = this.$route.params.nowCodeNo;
+ } else if (this.$route.params.nowCodeNo) {
+ this.searchData.oriCodeNo = this.$route.params.nowCodeNo;
this.search();
setTimeout(() => {
- this.searchData.codeNo = '';
+ this.searchData.oriCodeNo = '';
}, 200)
}
},
diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue
index 6690014..7e63845 100644
--- a/src/views/modules/tooling/searchToolApply.vue
+++ b/src/views/modules/tooling/searchToolApply.vue
@@ -49,6 +49,7 @@
+
{{ scope.row[item.columnProp] }}
- ![]()
+ ![]()
-
+
-
+
+
-
+
{{ scope.row[item.columnProp] }}
- ![]()
+ ![]()
-->
-
@@ -206,15 +203,14 @@
-
-
+
+
-
+
@@ -246,8 +241,12 @@
-
+
+
报价员
@@ -1678,6 +1677,9 @@ export default {
if (this.activeName === 'approvalInformation') {
this.getApprovalList()
}
+ if (this.activeName == 'attribute') { // 基本信息
+
+ }
},
searchToolApplyDetail() {
diff --git a/src/views/modules/tooling/toolingInfo.vue b/src/views/modules/tooling/toolingInfo.vue
index ce67030..8ae1504 100644
--- a/src/views/modules/tooling/toolingInfo.vue
+++ b/src/views/modules/tooling/toolingInfo.vue
@@ -420,59 +420,58 @@ export default {
}
},
changeSum(row){
- if(row.standardCost<0||row.standardCost==null||row.standardCost==''){
- row.standardCost=0
+ if (row.standardCost < 0 || row.standardCost == null || row.standardCost == '') {
+ row.standardCost = 0
// this.$alert('成本不能为负数或者不填', '错误', {
// confirmButtonText: '确定'
// })
-
}
this.dataForm.applySumQty = 0
this.dataForm.totalCost = 0
for (const item of this.selectionDataList) {
// 累加之前先确保值存在，并将 null 或 undefined 转换为0
- this.dataForm.applySumQty += Number(item.applyQty != null && item.applyQty !== '' ? item.applyQty : 0);
- this.dataForm.totalCost += Number(item.applyQty != null && item.applyQty !== '' ? item.applyQty*item.standardCost : 0);
+ this.dataForm.applySumQty += Number(item.applyQty != null && item.applyQty !== '' ? item.applyQty : 0)
+ this.dataForm.totalCost += Number(item.applyQty != null && item.applyQty !== '' ? item.applyQty * item.standardCost : 0)
}
},
- saveData(){
- if(this.dataForm.applySumQty===0){
- this.$alert('未填写申请数量！', '错误', {
+ saveData () {
+ if (this.dataForm.applySumQty === 0) {
+ this.$alert('未填写申请总数！', '错误', {
confirmButtonText: '确定'
})
return false;
}
- if(this.dataForm.applyBy===''||this.dataForm.applyBy==null){
+ if (this.dataForm.applyBy === '' || this.dataForm.applyBy == null) {
this.$alert('未选择申请人！', '错误', {
confirmButtonText: '确定'
})
return false;
}
- if(this.dataForm.applyDate===''||this.dataForm.applyDate==null){
+ if (this.dataForm.applyDate === '' || this.dataForm.applyDate == null) {
this.$alert('未选择申请日期！', '错误', {
confirmButtonText: '确定'
})
return false;
}
- if(this.dataForm.department===''||this.dataForm.department==null){
+ if (this.dataForm.department === '' || this.dataForm.department == null) {
this.$alert('未选择部门！', '错误', {
confirmButtonText: '确定'
})
return false;
}
- if(this.dataForm.quoter===''||this.dataForm.quoter==null){
+ if (this.dataForm.quoter === '' || this.dataForm.quoter == null) {
this.$alert('未选择报价员！', '错误', {
confirmButtonText: '确定'
})
return false;
}
- if(this.dataForm.tp===''||this.dataForm.tp==null){
+ if (this.dataForm.tp === '' || this.dataForm.tp == null) {
this.$alert('未选择TP！', '错误', {
confirmButtonText: '确定'
})
return false;
}
- if(this.dataForm.purchaser===''||this.dataForm.purchaser==null){
+ if (this.dataForm.purchaser === '' || this.dataForm.purchaser == null) {
this.$alert('未选择采购专员！', '错误', {
confirmButtonText: '确定'
})
@@ -484,46 +483,51 @@ export default {
type: 'warning'
}).then(() => {
for (let i = 0; i < this.selectionDataList.length; i++) {
- if (this.selectionDataList[i].applyQty===''||this.selectionDataList[i].applyQty==null){
- this.selectionDataList[i].applyQty=0
+ if (this.selectionDataList[i].applyQty === '' || this.selectionDataList[i].applyQty == null) {
+ this.selectionDataList[i].applyQty = 0
}
}
- this.dataForm.detailList=this.selectionDataList.filter(item => item.applyQty > 0).filter(item => item.standardCost >= 0)
+ this.dataForm.detailList = this.selectionDataList.filter(item => item.applyQty > 0).filter(item => item.standardCost >= 0)
saveProjectToolApply(this.dataForm).then(({data}) => {
if (data && data.code === 0) {
- this.visible=false;
- this.queryDataList();
+ this.visible = false
+ this.queryDataList()
this.$message.success('操作成功')
// 跳转
- if(this.jumpFlag){
+ if (this.jumpFlag) {
let inData = {
site: this.$store.state.user.site,
applyNo: data.applyNo,
username: this.$store.state.user.name
- };
+ }
localStorage.setItem('ToolApplyData', JSON.stringify(inData))
this.$router.push('tooling-searchToolApply')
}
} else {
- this.$message.warning(data.msg);
+ this.$message.warning(data.msg)
}
})
})
},
- applyModel() {
- if(this.selectionDataList.length===0){
+
+ // 工具申请
+ applyModel () {
+ if (this.selectionDataList.length === 0) {
this.$alert('请选择项目！', '错误', {confirmButtonText: '确定'})
return false;
}
+ this.selectionDataList.forEach(item => {
+ item.applyQty = ''
+ })
this.dataForm = {
site: this.$store.state.user.site,
applyNo: '',
- applyBy:this.$store.state.user.name,
- applyDate:new Date(),
- applySumQty:0,
- applyReason:'',
- remark:'',
- createBy:this.$store.state.user.name,
+ applyBy: this.$store.state.user.name,
+ applyDate: new Date(),
+ applySumQty: 0,
+ applyReason: '',
+ remark: '',
+ createBy: this.$store.state.user.name,
department: '',
quoter: '',
quoterName: '',
@@ -532,16 +536,18 @@ export default {
purchaser: '',
totalCost: '',
purchaserName: '',
- detailList:[],
- };
- this.visible=true;
- this.jumpFlag=true;
+ detailList: [],
+ }
+ this.visible = true
+ this.jumpFlag = true
},
},
+
created() {
// 初始化Site
this.queryParams.site = this.$store.state.user.site;
},
+
watch:{
queryLoading(newVal,oldVal){
if (newVal){
@@ -652,7 +658,7 @@ export default {
-
+
@@ -700,7 +706,7 @@ export default {
TP
-
+
@@ -710,7 +716,7 @@ export default {
-
+
跳转至申请记录
@@ -740,7 +746,7 @@ export default {
-
+