Commit cd76e88b authored by tanjunxin's avatar tanjunxin

1.领料申请细节修改; 2.生产工单增加转急单功能

parent 80d1197a
...@@ -151,3 +151,12 @@ export function getWorkOrderSoDirectivePkgRequireTypeEnum(workorderId) { ...@@ -151,3 +151,12 @@ export function getWorkOrderSoDirectivePkgRequireTypeEnum(workorderId) {
method: 'get' method: 'get'
}) })
} }
// 转急单
export function updateRequestDateApi(data) {
return request({
url: "/mes/pro/workorder/updateRequestDate",
method: "post",
data: data,
});
}
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料编码" align="center" prop="sapItemCode" width="100" /> <!-- <el-table-column label="物料编码" align="center" prop="sapItemCode" width="100" /> -->
<el-table-column label="工作单元" align="center" prop="workunitName" width="100" /> <el-table-column label="工作单元" align="center" prop="workunitName" width="100" />
<el-table-column label="领料类型" align="center" prop="applyType"> <el-table-column label="领料类型" align="center" prop="applyType">
<template slot-scope="scope"> <template slot-scope="scope">
......
...@@ -129,6 +129,11 @@ ...@@ -129,6 +129,11 @@
v-hasPermi="['pro:combination:add']">订单组合 v-hasPermi="['pro:combination:add']">订单组合
</el-button> </el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="single" @click="handleTurnWorry">
转急单
</el-button>
</el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-edit" size="mini" @click="()=>handleCombination('del')" :disabled="combinationDisable" <el-button type="warning" plain icon="el-icon-edit" size="mini" @click="()=>handleCombination('del')" :disabled="combinationDisable"
>取消组合 >取消组合
...@@ -560,6 +565,22 @@ ...@@ -560,6 +565,22 @@
</div> </div>
</div> </div>
</div> </div>
<el-dialog title="添加转急单" :visible.sync="turnWorryVisible" width="340px" append-to-body>
<el-form ref="turnWorryFormRef" :model="turnWorryForm" :rules="turnWorryFormRules" label-width="80px">
<el-form-item label="需求时间" prop="requestDate">
<el-date-picker
v-model="turnWorryForm.requestDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleTurnWorrySubmit"> </el-button>
<el-button @click="handleTurnWorryCancle"> </el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
...@@ -580,7 +601,8 @@ import { ...@@ -580,7 +601,8 @@ import {
doCheckToolNum, doCheckToolNum,
delComWorkorder, delComWorkorder,
closeWorkorder, closeWorkorder,
closeCheck closeCheck,
updateRequestDateApi
} from "@/api/mes/pro/workorder"; } from "@/api/mes/pro/workorder";
import { addProtaskList } from "@/api/mes/pro/protask"; import { addProtaskList } from "@/api/mes/pro/protask";
import shiftSelectMixin from '@/utils/shiftSelectMixin' import shiftSelectMixin from '@/utils/shiftSelectMixin'
...@@ -760,7 +782,17 @@ export default { ...@@ -760,7 +782,17 @@ export default {
}, },
productionSolutionTable: [], productionSolutionTable: [],
workOrderTable: [], workOrderTable: [],
printloading: false printloading: false,
turnWorryVisible: false,
turnWorryForm: {
workorderId: '',
requestDate: ''
},
turnWorryFormRules: {
requestDate: [
{ required: true, message: "需求时间不能为空", trigger: "blur" },
],
},
}; };
}, },
activated() { activated() {
...@@ -1448,6 +1480,32 @@ export default { ...@@ -1448,6 +1480,32 @@ export default {
this.form.workorderCode = null; this.form.workorderCode = null;
} }
}, },
handleTurnWorry() {
console.log(this.selectedRows);
if(["PREPARE", "PUBLISHED"].includes(this.selectedRows[0].status)) {
this.turnWorryForm.workorderId = this.selectedRows[0].workorderId;
this.turnWorryVisible = true;
} else {
this.$message({
message: '所选工单不处于已发布或者待发布状态不允许更改!',
type: 'warning'
});
}
},
handleTurnWorrySubmit() {
this.$refs["turnWorryFormRef"].validate(valid => {
if (valid) {
updateRequestDateApi(this.turnWorryForm).then(response => {
this.$modal.msgSuccess("操作成功");
this.handleTurnWorryCancle();
this.getList();
});
}
});
},
handleTurnWorryCancle() {
this.turnWorryVisible = false;
},
}, },
}; };
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment