Commit 38e08d07 authored by chenzj's avatar chenzj

领料单和调拨料申请修复

parent 181aad0a
...@@ -143,18 +143,6 @@ ...@@ -143,18 +143,6 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col span="12">
<el-form-item label="是的结案" prop="windCase">
<el-radio-group v-model="form.windCase" disabled v-if="optType == 'view'">
<el-radio v-for="dict in dict.type.sys_yes_no" :key="dict.value"
:label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
<el-radio-group v-model="form.windCase" v-else>
<el-radio v-for="dict in dict.type.sys_yes_no" :key="dict.value"
:label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col span="12"> <el-col span="12">
<el-form-item label="需求日期" prop="startTime"> <el-form-item label="需求日期" prop="startTime">
<el-date-picker clearable v-model="form.startTime" type="date" value-format="yyyy-MM-dd" <el-date-picker clearable v-model="form.startTime" type="date" value-format="yyyy-MM-dd"
......
...@@ -344,7 +344,7 @@ export default { ...@@ -344,7 +344,7 @@ export default {
}, },
// 表单重置 // 表单重置
reset() { reset() {
this.daterangePurchaseDate = [];
this.form = { this.form = {
materialRequestId: null, materialRequestId: null,
applyNo: null, applyNo: null,
...@@ -367,8 +367,8 @@ export default { ...@@ -367,8 +367,8 @@ export default {
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
windCase: null, windCase: null,
grantNum: null, }; grantNum: null, };
this.daterangePurchaseDate = [];
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
......
...@@ -357,6 +357,7 @@ export default { ...@@ -357,6 +357,7 @@ export default {
returnNum: null, returnNum: null,
windCase: null windCase: null
}; };
this.daterangePurchaseDate= [];
this.resetForm("form"); this.resetForm("form");
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
......
...@@ -9,15 +9,6 @@ ...@@ -9,15 +9,6 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="生产工单" prop="workorderCode">
<el-input
v-model="queryParams.workorderCode"
placeholder="请输入仓库名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker <el-date-picker
v-model="daterangePurchaseDate" v-model="daterangePurchaseDate"
...@@ -102,8 +93,7 @@ ...@@ -102,8 +93,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="生产工单" align="center" prop="workorderCode" />
<el-table-column label="申请单号" align="center" prop="applyNo" />
<el-table-column label="创建人" align="center" prop="createBy" /> <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="领料日期" align="center" prop="issueDate" width="180"> <el-table-column label="领料日期" align="center" prop="issueDate" width="180">
<!-- <template slot-scope="scope">width="180" <!-- <template slot-scope="scope">width="180"
...@@ -182,21 +172,6 @@ ...@@ -182,21 +172,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="12">
<el-form-item label="生产工单" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请选择生产工单" >
<el-button slot="append" icon="el-icon-search" @click="handleWorkorderSelect"></el-button>
</el-input>
</el-form-item>
<WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect>
</el-col>
<el-col :span="12">
<el-form-item label="申请单号" prop="applyNo">
<el-input v-model="form.applyNo" placeholder="请输入申请单" />
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
......
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" /> <el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" />
<el-table-column label="产品物料名称" width="120px" align="center" prop="itemName" :show-overflow-tooltip="true"/> <el-table-column label="产品物料名称" width="120px" align="center" prop="itemName" :show-overflow-tooltip="true"/>
<el-table-column label="生产工单" align="center" prop="workorderCode" />
<el-table-column label="申请单号" align="center" prop="applyNo" />
<el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/> <el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
<el-table-column label="单位" align="center" prop="unitOfMeasure" /> <el-table-column label="单位" align="center" prop="unitOfMeasure" />
<el-table-column label="领料数量" align="center" prop="quantityIssued" /> <el-table-column label="领料数量" align="center" prop="quantityIssued" />
......
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