diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue
index 864c9e9..43e9014 100644
--- a/src/views/modules/tooling/searchToolApply.vue
+++ b/src/views/modules/tooling/searchToolApply.vue
@@ -282,6 +282,13 @@
采购员
+
+ CS
+
+
+
+
+
@@ -385,11 +392,24 @@
-
+
+
+
+
+ CS
+
+
+
+
+
+
+
+
+
@@ -442,6 +462,13 @@
采购员
+
+ CS
+
+
+
+
+
@@ -544,11 +571,24 @@
-
+
+
+
+
+ CS
+
+
+
+
+
+
+
+
+
@@ -755,6 +795,13 @@
采购员
+
+ CS
+
+
+
+
+
@@ -858,11 +905,24 @@
-
+
+
+
+
+ CS
+
+
+
+
+
+
+
+
+
@@ -1019,7 +1079,10 @@ export default {
userName: this.$store.state.user.name,
nodeId: '',
sp: '',
- isReject: ''
+ isReject: '',
+ offsetOfExpenses: '',
+ cs: '',
+ csName: '',
},
valueNull: '******',
modelData: {
@@ -1031,6 +1094,7 @@ export default {
supplierName: '',
allCost: '',
remark2: '',
+ co: '',
},
toolDetailSearchData:{
projectId: '',
@@ -1388,6 +1452,24 @@ export default {
fixed: '',
columnWidth: 60
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 106002,
+ serialNumber: '106002Table1CsName',
+ tableId: "106002Table1",
+ tableName: "刀具申请主表",
+ columnProp: "csName",
+ headerAlign: "center",
+ align: "left",
+ columnLabel: "CS",
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 60
+ },
{
userId: this.$store.state.user.name,
functionId: 106002,
@@ -2139,6 +2221,12 @@ export default {
this.$nextTick(() => {
this.$triggerInputEvent(this.$refs.purchaserName);
});
+ } else if (this.tagNo === 2051) {
+ this.dataForm.cs = val.username
+ this.dataForm.csName = val.user_display
+ this.$nextTick(() => {
+ this.$triggerInputEvent(this.$refs.csName);
+ });
}
},
@@ -2336,7 +2424,10 @@ export default {
userName: this.$store.state.user.name,
nodeId: row.nodeId,
sp: row.sp,
- isReject: row.isReject
+ isReject: row.isReject,
+ cs: row.cs,
+ csName: row.csName,
+ offsetOfExpenses: row.offsetOfExpenses,
}
searchProjectToolApplyDetail({
site: row.site,
@@ -2377,7 +2468,10 @@ export default {
userName: this.$store.state.user.name,
nodeId: row.nodeId,
sp: row.sp,
- isReject: row.isReject
+ isReject: row.isReject,
+ cs: row.cs,
+ csName: row.csName,
+ offsetOfExpenses: row.offsetOfExpenses,
}
searchProjectToolApplyDetail({
site: row.site,
@@ -2415,7 +2509,10 @@ export default {
totalCost: row.totalCost,
menuId: this.$route.meta.menuId,
userName: this.$store.state.user.name,
- nodeId: row.nodeId
+ nodeId: row.nodeId,
+ offsetOfExpenses: row.offsetOfExpenses,
+ cs: row.cs,
+ csName: row.csName
}
searchProjectToolApplyDetail({
site: row.site,
@@ -2562,6 +2659,7 @@ export default {
this.pageIndex1 = val
this.addChangeDetail()
},
+
openModelMessage() {
this.modelData = {
site: this.currentRow.site,
@@ -2572,6 +2670,7 @@ export default {
supplierName: this.currentRow.supplierName,
allCost: this.currentRow.allCost,
remark2: this.currentRow.remark2,
+ co: this.currentRow.co
}
},
@@ -2591,6 +2690,7 @@ export default {
supplierName: this.currentRow.supplierName,
allCost: this.currentRow.allCost,
remark2: this.currentRow.remark2,
+ co: this.currentRow.co
}
this.modelFlag = true
},
@@ -2625,7 +2725,7 @@ export default {
this.currentRow.allCost = this.modelData.allCost
this.currentRow.totalCost = this.modelData.totalCost
this.currentRow.remark2 = this.modelData.remark2
-
+ this.currentRow.co = this.modelData.co
this.$message({
message: '操作成功',
type: 'success',
@@ -2641,8 +2741,8 @@ export default {
})
})
},
- saveHeaderMessage2() {
+ saveHeaderMessage2() {
saveProjectHeaderMessage(this.modelData).then(({data}) => {
if (data && data.code === 0) {
this.modelFlag = false;
@@ -2653,13 +2753,12 @@ export default {
this.currentRow.allCost = this.modelData.allCost
this.currentRow.totalCost = this.modelData.totalCost
this.currentRow.remark2 = this.modelData.remark2
-
+ this.currentRow.co = this.modelData.co
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
- onClose: () => {
- }
+ onClose: () => {}
})
} else {
this.$alert(data.msg, '错误', {
@@ -2667,8 +2766,8 @@ export default {
})
}
})
-
},
+
// 同意提交
agreeSubmit() {
this.$confirm(`是否确认提交?`, '提示', {
@@ -2755,6 +2854,7 @@ export default {
}
this.visible = false
this.visibleU = false
+ this.search()
this.refreshCurrentTabTable()
// this.$message({
// message: '操作成功',
@@ -2989,7 +3089,6 @@ export default {
activated() {
this.checkSuperAdmin()
if (this.$route.params.type === 'tokenLogin') {
- console.log("进来啦")
if (this.$route.params.docNo) {
this.searchData.applyNo = this.$route.params.docNo
}