fix:生产报工审核按钮增加过滤。采购入库中修改物料入库未回显问题解决。生产领料新增提示。供应商退货和产品入库删除提示信息优化

This commit is contained in:
zhangxuanming 2024-12-24 15:10:46 +08:00
parent 28a81f95b7
commit c294978492
5 changed files with 22 additions and 12 deletions

View File

@ -297,8 +297,8 @@
<el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' "> </el-button>
<el-button type="primary" @click="handleSubmit" v-if="form.status =='PREPARE' && optType !='view' && form.recordId !=null ">提交审批</el-button>
<el-button type="success" @click="handleExecute" v-if="form.status =='APPROVING' && form.recordId !=null">审批通过</el-button>
<el-button type="danger" @click="handleReject" v-if="form.status =='APPROVING' && form.recordId !=null">审批不通过</el-button>
<el-button type="success" @click="handleExecute" v-if="form.status =='APPROVING' && form.recordId !=null && form.recordNick == user.nickName">审批通过</el-button>
<el-button type="danger" @click="handleReject" v-if="form.status =='APPROVING' && form.recordId !=null && form.recordNick == user.nickName">审批不通过</el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
@ -311,12 +311,14 @@ import WorkorderSelect from "@/components/workorderSelect/single.vue"
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
import UserSingleSelect from "@/components/userSelect/single.vue"
import ProtaskSelect from "@/components/TaskSelect/taskSelectSingle.vue"
import {getUserProfile} from "@/api/system/user";
export default {
name: "Feedback",
components: {WorkorderSelect,WorkstationSelect,UserSingleSelect,ProtaskSelect},
dicts: ['mes_order_status', 'mes_feedback_type'],
data() {
return {
user: {}, //
optType: undefined,
//
loading: true,
@ -393,6 +395,9 @@ export default {
},
created() {
this.getList();
getUserProfile().then(response => {
this.user = response.data;
});
},
methods: {
/** 查询生产报工记录列表 */

View File

@ -221,13 +221,13 @@
</el-col>
<el-col :span="8">
<el-form-item label="客户编号" >
<el-input v-model="form.clientCode" placeholder="请选择生产工单" >
<el-input v-model="form.clientCode" placeholder="请输入客户编号" >
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户名称" >
<el-input v-model="form.clientName" placeholder="请选择生产工单" >
<el-input v-model="form.clientName" placeholder="请输入客户名称" >
</el-input>
</el-form-item>
</el-col>

View File

@ -316,6 +316,7 @@ export default {
updateBy: null,
updateTime: null
};
this.$set(this, "warehouseInfo", [])
this.resetForm("form");
},
/** 搜索按钮操作 */
@ -339,9 +340,11 @@ export default {
this.reset();
this.warehouseInfo = [];
if(this.warehouseId != null){
this.warehouseInfo[0] = this.warehouseId;
this.warehouseInfo[1] = this.locationId;
this.warehouseInfo[2] = this.areaId;
let tempList = []
tempList.push(this.warehouseId)
tempList.push(this.locationId)
tempList.push(this.areaId)
this.$set(this, "warehouseInfo", tempList)
}
this.open = true;
this.title = "添加物料入库单行";
@ -352,9 +355,11 @@ export default {
const lineId = row.lineId || this.ids
getItemrecptline(lineId).then(response => {
this.form = response.data;
this.warehouseInfo[0] = response.data.warehouseId;
this.warehouseInfo[1] = response.data.locationId;
this.warehouseInfo[2] = response.data.areaId;
let tempList = []
tempList.push(response.data.warehouseId)
tempList.push(response.data.locationId)
tempList.push(response.data.areaId)
this.$set(this, "warehouseInfo", tempList)
this.open = true;
this.title = "修改物料入库单行";
});

View File

@ -430,7 +430,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const recptIds = row.recptId || this.ids;
this.$modal.confirm('是否确认删除产品入库单编号为"' + recptIds + '"的数据项?').then(function() {
this.$modal.confirm('是否确认删除产品入库单编号为"' + row.recptCode + '"的数据项?').then(function() {
return delProductrecpt(recptIds);
}).then(() => {
this.getList();

View File

@ -430,7 +430,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const rtIds = row.rtId || this.ids;
this.$modal.confirm('是否确认删除供应商退货编号为"' + rtIds + '"的数据项?').then(function() {
this.$modal.confirm('是否确认删除供应商退货编号为"' + row.rtCode + '"的数据项?').then(function() {
return delRtvendor(rtIds);
}).then(() => {
this.getList();