zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

退火时车间库存的筛选

This commit is contained in:
shijing 2024-01-31 13:19:14 +08:00
parent 57daa1bc19
commit 58e7ea29ad
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/wpm/mlog_tui.vue
View File

@ -208,8 +208,9 @@
<el-button type="primary" @click="submitHandover">提交</el-button> <el-button type="primary" @click="submitHandover">提交</el-button>
</el-footer> </el-footer>
</el-dialog> </el-dialog>
<save-dialog v-if="dialogSave" ref="saveDialog" :mgroup="currentMgroup.id" :mgroupShiftRule="currentMgroup.shift_rule" <save-dialog v-if="dialogSave" ref="saveDialog" :belongdept="currentMgroup.belong_dept" :mgroup="currentMgroup.id"
:activeType="activeName" @success="handleSaveSuccess" @closed="dialogSave = false"> :mgroupShiftRule="currentMgroup.shift_rule" :activeType="activeName" @success="handleSaveSuccess"
@closed="dialogSave = false">
</save-dialog> </save-dialog>
</template> </template>
<script> <script>

23
src/views/wpm/worktask_form.vue
View File

@ -129,9 +129,14 @@
</el-col> </el-col>
<el-col :md="12" :sm="24"> <el-col :md="12" :sm="24">
<el-form-item label="批次号" prop="material_in"> <el-form-item label="批次号" prop="material_in">
<el-select v-model="form.batch" placeholder="批次号" filterable clearable allow-create style="width: 100%"> <el-select v-model="form.batch" placeholder="批次号" filterable clearable style="width: 100%">
<el-option v-for="item in wMaterialOptions" :key="item.batch" :label="item.batch" <el-option v-for="item in wMaterialOptions" :key="item.batch" :label="item.batch" :value="item.batch">
:value="item.batch"></el-option> <div style="display:flex;justify-content:space-between">
<span>{{ item.batch }}</span>
<span style="color:#aaaaaa">{{ item.count }}</span>
</div>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -577,7 +582,8 @@ export default {
material_out: { type: String, default: "" }, material_out: { type: String, default: "" },
material_model: { type: String, default: "" }, material_model: { type: String, default: "" },
brothersList: { type: Array, default: () => [] }, brothersList: { type: Array, default: () => [] },
mtaskDate: { type: String, default: "" } mtaskDate: { type: String, default: "" },
belongdept: { type: String, default: "" }
}, },
data() { data() {
return { return {
@ -654,7 +660,9 @@ export default {
} else { } else {
batchDate = dateNow; batchDate = dateNow;
} }
this.form.batch = this.material_model + '-' + batchDate; if (this.activeType == "10车间" || this.activeType == "7车间") {
this.form.batch = this.material_model + '-' + batchDate;
}
this.getMaterial(); this.getMaterial();
this.getUserList(); this.getUserList();
this.getEquipment(); this.getEquipment();
@ -670,10 +678,9 @@ export default {
}, },
methods: { methods: {
routeChange(item) { routeChange(item) {
this.form.material_out = item.material_out;
this.form.material_out = item.material_out; this.form.material_out = item.material_out;
this.form.material_in = item.material_in this.form.material_in = item.material_in
this.form.mgroup = item.mgroup this.form.mgroup = item.mgroup;
this.getWorkShopMaterial(); this.getWorkShopMaterial();
}, },
getRouteOptions() { getRouteOptions() {
@ -797,7 +804,7 @@ export default {
let that = this; let that = this;
if (this.form.material_in) { if (this.form.material_in) {
this.$API.wpm.wmaterial.list this.$API.wpm.wmaterial.list
.req({ material: this.form.material_in, page: 0, count__gte: 1 }) .req({ material: this.form.material_in, page: 0, count__gte: 1, belong_dept: that.belongdept })
.then((res) => { .then((res) => {
that.wMaterialOptions = res; that.wMaterialOptions = res;
}); });