Browse Source

2025-08-29 1、表头添加费用抵消字段,下拉选项(数据字典)

2、采购处理结果添加两个字段,CS和CO,CS从CS组中选择,CO手工录入字符串
master
fengyuan_yang 5 months ago
parent
commit
bc0a6b6402
  1. 127
      src/views/modules/tooling/searchToolApply.vue

127
src/views/modules/tooling/searchToolApply.vue

@ -282,6 +282,13 @@
<span slot="label" style="" @click="getBaseList(2000,3)"><a herf="#">采购员</a></span> <span slot="label" style="" @click="getBaseList(2000,3)"><a herf="#">采购员</a></span>
<el-input v-model="dataForm.purchaserName" ref="purchaserName" placeholder="请选择人员" readonly style="width: 130px"></el-input> <el-input v-model="dataForm.purchaserName" ref="purchaserName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<el-form-item>
<span slot="label" style="" @click="getBaseList(2051)"><a herf="#">CS</a></span>
<el-input v-model="dataForm.csName" ref="csName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
</el-form-item>
<el-form-item label="费用抵消">
<dict-data-select v-model="dataForm.offsetOfExpenses" style="width: 130px" dict-type="tool_offset_of_expenses"></dict-data-select>
</el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" label-width="100px"> <el-form :inline="true" label-position="top" label-width="100px">
<el-form-item :label="'申请原因'"> <el-form-item :label="'申请原因'">
@ -385,11 +392,24 @@
</el-row> </el-row>
<el-row :gutter="15" style="margin-top: 0px"> <el-row :gutter="15" style="margin-top: 0px">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" style="height: 240px">
<el-form-item label="备注" style="height: 90px">
<el-input type="textarea" v-model="modelData.remark2" :rows="3" style="height: 60px" :disabled="$store.state.user.name!==dataForm.purchaser&&!superAdmin"></el-input> <el-input type="textarea" v-model="modelData.remark2" :rows="3" style="height: 60px" :disabled="$store.state.user.name!==dataForm.purchaser&&!superAdmin"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="15" style="margin-top: 0px">
<el-col :span="4">
<el-form-item>
<span slot="label" style="" @click="getBaseList(2051)"><a herf="#">CS</a></span>
<el-input v-model="dataForm.csName" ref="csName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="CO">
<el-input v-model="modelData.co" :disabled="$store.state.user.name !== dataForm.purchaser && !superAdmin"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="附件信息" name="down"> <el-tab-pane label="附件信息" name="down">
@ -442,6 +462,13 @@
<span slot="label" style="" @click="getBaseList(2000,3)"><a herf="#">采购员</a></span> <span slot="label" style="" @click="getBaseList(2000,3)"><a herf="#">采购员</a></span>
<el-input v-model="dataForm.purchaserName" ref="purchaserName" placeholder="请选择人员" readonly style="width: 130px"></el-input> <el-input v-model="dataForm.purchaserName" ref="purchaserName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<el-form-item>
<span slot="label" style="" @click="getBaseList(2051)"><a herf="#">CS</a></span>
<el-input v-model="dataForm.csName" ref="csName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
</el-form-item>
<el-form-item label="费用抵消">
<dict-data-select v-model="dataForm.offsetOfExpenses" style="width: 130px" dict-type="tool_offset_of_expenses"></dict-data-select>
</el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" label-width="100px"> <el-form :inline="true" label-position="top" label-width="100px">
<el-form-item :label="'申请原因'"> <el-form-item :label="'申请原因'">
@ -544,11 +571,24 @@
</el-row> </el-row>
<el-row :gutter="15"> <el-row :gutter="15">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" style="height: 240px">
<el-form-item label="备注" style="height: 90px">
<el-input type="textarea" v-model="modelData.remark2" :rows="3" :disabled="$store.state.user.name!==dataForm.purchaser&&!superAdmin"></el-input> <el-input type="textarea" v-model="modelData.remark2" :rows="3" :disabled="$store.state.user.name!==dataForm.purchaser&&!superAdmin"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="15">
<el-col :span="4">
<el-form-item>
<span slot="label" @click="getBaseList(2051)"><a herf="#">CS</a></span>
<el-input v-model="dataForm.csName" ref="csName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="CO">
<el-input v-model="modelData.co" :disabled="$store.state.user.name !== dataForm.purchaser && !superAdmin"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="附件信息" name="down"> <el-tab-pane label="附件信息" name="down">
@ -755,6 +795,13 @@
<span slot="label" style="">采购员</span> <span slot="label" style="">采购员</span>
<el-input v-model="dataForm.purchaserName" ref="purchaserName" placeholder="请选择人员" readonly style="width: 130px"></el-input> <el-input v-model="dataForm.purchaserName" ref="purchaserName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<el-form-item>
<span slot="label" style="">CS</span>
<el-input v-model="dataForm.csName" ref="csName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
</el-form-item>
<el-form-item label="费用抵消">
<dict-data-select v-model="dataForm.offsetOfExpenses" style="width: 130px" disabled dict-type="tool_offset_of_expenses"></dict-data-select>
</el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" label-width="100px"> <el-form :inline="true" label-position="top" label-width="100px">
<el-form-item :label="'申请原因'"> <el-form-item :label="'申请原因'">
@ -858,11 +905,24 @@
</el-row> </el-row>
<el-row :gutter="15"> <el-row :gutter="15">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" style="height: 240px">
<el-form-item label="备注" style="height: 90px">
<el-input readonly type="textarea" v-model="modelData.remark2" :rows="3" :disabled="$store.state.user.name!==dataForm.purchaser&&!superAdmin"></el-input> <el-input readonly type="textarea" v-model="modelData.remark2" :rows="3" :disabled="$store.state.user.name!==dataForm.purchaser&&!superAdmin"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="15">
<el-col :span="4">
<el-form-item>
<span slot="label" style="">CS</span>
<el-input v-model="dataForm.csName" ref="csName" placeholder="请选择人员" readonly style="width: 130px"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="CO">
<el-input readonly v-model="modelData.co" :disabled="$store.state.user.name !== dataForm.purchaser&&!superAdmin"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="附件信息" name="down"> <el-tab-pane label="附件信息" name="down">
@ -1019,7 +1079,10 @@ export default {
userName: this.$store.state.user.name, userName: this.$store.state.user.name,
nodeId: '', nodeId: '',
sp: '', sp: '',
isReject: ''
isReject: '',
offsetOfExpenses: '',
cs: '',
csName: '',
}, },
valueNull: '******', valueNull: '******',
modelData: { modelData: {
@ -1031,6 +1094,7 @@ export default {
supplierName: '', supplierName: '',
allCost: '', allCost: '',
remark2: '', remark2: '',
co: '',
}, },
toolDetailSearchData:{ toolDetailSearchData:{
projectId: '', projectId: '',
@ -1388,6 +1452,24 @@ export default {
fixed: '', fixed: '',
columnWidth: 60 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, userId: this.$store.state.user.name,
functionId: 106002, functionId: 106002,
@ -2139,6 +2221,12 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.$triggerInputEvent(this.$refs.purchaserName); 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, userName: this.$store.state.user.name,
nodeId: row.nodeId, nodeId: row.nodeId,
sp: row.sp, sp: row.sp,
isReject: row.isReject
isReject: row.isReject,
cs: row.cs,
csName: row.csName,
offsetOfExpenses: row.offsetOfExpenses,
} }
searchProjectToolApplyDetail({ searchProjectToolApplyDetail({
site: row.site, site: row.site,
@ -2377,7 +2468,10 @@ export default {
userName: this.$store.state.user.name, userName: this.$store.state.user.name,
nodeId: row.nodeId, nodeId: row.nodeId,
sp: row.sp, sp: row.sp,
isReject: row.isReject
isReject: row.isReject,
cs: row.cs,
csName: row.csName,
offsetOfExpenses: row.offsetOfExpenses,
} }
searchProjectToolApplyDetail({ searchProjectToolApplyDetail({
site: row.site, site: row.site,
@ -2415,7 +2509,10 @@ export default {
totalCost: row.totalCost, totalCost: row.totalCost,
menuId: this.$route.meta.menuId, menuId: this.$route.meta.menuId,
userName: this.$store.state.user.name, userName: this.$store.state.user.name,
nodeId: row.nodeId
nodeId: row.nodeId,
offsetOfExpenses: row.offsetOfExpenses,
cs: row.cs,
csName: row.csName
} }
searchProjectToolApplyDetail({ searchProjectToolApplyDetail({
site: row.site, site: row.site,
@ -2562,6 +2659,7 @@ export default {
this.pageIndex1 = val this.pageIndex1 = val
this.addChangeDetail() this.addChangeDetail()
}, },
openModelMessage() { openModelMessage() {
this.modelData = { this.modelData = {
site: this.currentRow.site, site: this.currentRow.site,
@ -2572,6 +2670,7 @@ export default {
supplierName: this.currentRow.supplierName, supplierName: this.currentRow.supplierName,
allCost: this.currentRow.allCost, allCost: this.currentRow.allCost,
remark2: this.currentRow.remark2, remark2: this.currentRow.remark2,
co: this.currentRow.co
} }
}, },
@ -2591,6 +2690,7 @@ export default {
supplierName: this.currentRow.supplierName, supplierName: this.currentRow.supplierName,
allCost: this.currentRow.allCost, allCost: this.currentRow.allCost,
remark2: this.currentRow.remark2, remark2: this.currentRow.remark2,
co: this.currentRow.co
} }
this.modelFlag = true this.modelFlag = true
}, },
@ -2625,7 +2725,7 @@ export default {
this.currentRow.allCost = this.modelData.allCost this.currentRow.allCost = this.modelData.allCost
this.currentRow.totalCost = this.modelData.totalCost this.currentRow.totalCost = this.modelData.totalCost
this.currentRow.remark2 = this.modelData.remark2 this.currentRow.remark2 = this.modelData.remark2
this.currentRow.co = this.modelData.co
this.$message({ this.$message({
message: '操作成功', message: '操作成功',
type: 'success', type: 'success',
@ -2641,8 +2741,8 @@ export default {
}) })
}) })
}, },
saveHeaderMessage2() {
saveHeaderMessage2() {
saveProjectHeaderMessage(this.modelData).then(({data}) => { saveProjectHeaderMessage(this.modelData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.modelFlag = false; this.modelFlag = false;
@ -2653,13 +2753,12 @@ export default {
this.currentRow.allCost = this.modelData.allCost this.currentRow.allCost = this.modelData.allCost
this.currentRow.totalCost = this.modelData.totalCost this.currentRow.totalCost = this.modelData.totalCost
this.currentRow.remark2 = this.modelData.remark2 this.currentRow.remark2 = this.modelData.remark2
this.currentRow.co = this.modelData.co
this.$message({ this.$message({
message: '操作成功', message: '操作成功',
type: 'success', type: 'success',
duration: 1500, duration: 1500,
onClose: () => {
}
onClose: () => {}
}) })
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
@ -2667,8 +2766,8 @@ export default {
}) })
} }
}) })
}, },
// //
agreeSubmit() { agreeSubmit() {
this.$confirm(`是否确认提交?`, '提示', { this.$confirm(`是否确认提交?`, '提示', {
@ -2755,6 +2854,7 @@ export default {
} }
this.visible = false this.visible = false
this.visibleU = false this.visibleU = false
this.search()
this.refreshCurrentTabTable() this.refreshCurrentTabTable()
// this.$message({ // this.$message({
// message: '', // message: '',
@ -2989,7 +3089,6 @@ export default {
activated() { activated() {
this.checkSuperAdmin() this.checkSuperAdmin()
if (this.$route.params.type === 'tokenLogin') { if (this.$route.params.type === 'tokenLogin') {
console.log("进来啦")
if (this.$route.params.docNo) { if (this.$route.params.docNo) {
this.searchData.applyNo = this.$route.params.docNo this.searchData.applyNo = this.$route.params.docNo
} }

Loading…
Cancel
Save