Commit d6810e06 authored by 张海景's avatar 张海景

update:修改工装夹具申请单详情接口和查询条件加状态

parent 62707722
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
</el-form> </el-form>
<el-divider content-position="center">刀模版申请详细</el-divider> <el-divider content-position="center">刀模版申请详细</el-divider>
<el-card shadow="always" class="box-card"> <el-card shadow="always" class="box-card">
<itemline ref="line" :quantity="form.requestNum" :toolRequestId="form.toolRequestId" :taskId="form.taskId" :optType="optType" @sum="handleSumNum"></itemline> <itemline ref="line" :quantity="form.requestNum" :toolRequestId="form.toolRequestId" :taskId="form.taskWorkunitId" :optType="optType" @sum="handleSumNum"></itemline>
</el-card> </el-card>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button v-if="!form.toolRequestId" type="primary" @click="submitForm"> </el-button> <el-button v-if="!form.toolRequestId" type="primary" @click="submitForm"> </el-button>
...@@ -472,6 +472,7 @@ export default { ...@@ -472,6 +472,7 @@ export default {
onSelectTask(row){ onSelectTask(row){
console.log(row, 'rows') console.log(row, 'rows')
this.$set(this.form, 'taskId', row.taskId) this.$set(this.form, 'taskId', row.taskId)
this.$set(this.form, 'taskWorkunitId', row.taskWorkunitId)
this.form.requestDate = row.createTime this.form.requestDate = row.createTime
this.form.processId = row.processId this.form.processId = row.processId
this.form.startTime = row.startTime this.form.startTime = row.startTime
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
v-model="queryParams.taskCode" v-model="queryParams.taskCode"
placeholder="请输入任务单编码" placeholder="请输入任务单编码"
clearable clearable
style="width: 200px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
...@@ -31,7 +30,6 @@ ...@@ -31,7 +30,6 @@
v-model="queryParams.workOrderCode" v-model="queryParams.workOrderCode"
placeholder="请输入生产工单" placeholder="请输入生产工单"
clearable clearable
style="width: 200px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
...@@ -40,10 +38,33 @@ ...@@ -40,10 +38,33 @@
v-model="queryParams.arrangeCode" v-model="queryParams.arrangeCode"
placeholder="请输入编排单号" placeholder="请输入编排单号"
clearable clearable
style="width: 200px"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="编排单号" prop="arrangeCode">
<el-input
v-model="queryParams.arrangeCode"
placeholder="请输入编排单号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="statusArr">
<el-select
v-model="queryParams.statusArr"
clearable
multiple
placeholder="请选择入库方式"
>
<el-option
v-for="dict in dict.type.TASK_STATUS"
:key="dict.value"
:label="dict.label"
:value="dict.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"
...@@ -171,7 +192,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css"; ...@@ -171,7 +192,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "MdItemSingle", name: "MdItemSingle",
dicts: ["sys_yes_no", "mes_item_product"], dicts: ["TASK_STATUS"],
components: { Treeselect }, components: { Treeselect },
data() { data() {
return { return {
...@@ -201,8 +222,9 @@ export default { ...@@ -201,8 +222,9 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
statusArr: '',
workorderType: 'SELF', workorderType: 'SELF',
statusStr: 'PREPARE,BEGINNING,ISSUEGENERATED' // statusStr: 'PREPARE,BEGINNING,ISSUEGENERATED'
}, },
}; };
}, },
......
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