Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web
This commit is contained in:
commit
c8e1b732bc
|
|
@ -127,6 +127,8 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="创建时间" prop="create_time">
|
<el-table-column label="创建时间" prop="create_time">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="备注" prop="note">
|
||||||
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="操作"
|
label="操作"
|
||||||
fixed="right"
|
fixed="right"
|
||||||
|
|
|
||||||
|
|
@ -131,7 +131,6 @@
|
||||||
></el-option>
|
></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
<el-form-item
|
<el-form-item
|
||||||
label="部门执行人"
|
label="部门执行人"
|
||||||
v-if="form.type == 'do_in' || form.type == 'do_out'|| form.type == 'borrow_out' || form.type == 'return_in'"
|
v-if="form.type == 'do_in' || form.type == 'do_out'|| form.type == 'borrow_out' || form.type == 'return_in'"
|
||||||
|
|
@ -161,6 +160,9 @@
|
||||||
></el-option>
|
></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="备注">
|
||||||
|
<el-input v-model="form.note" placeholder="编号" />
|
||||||
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<el-button type="primary" :loading="isSaveing" @click="submit">
|
<el-button type="primary" :loading="isSaveing" @click="submit">
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,6 @@
|
||||||
@click="table_add(50)"
|
@click="table_add(50)"
|
||||||
v-auth="'handover.create'"
|
v-auth="'handover.create'"
|
||||||
>改版</el-button>
|
>改版</el-button>
|
||||||
<el-button type="primary" @click="expendChange">{{changeText}}</el-button>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="right-panel">
|
<div class="right-panel">
|
||||||
<el-select
|
<el-select
|
||||||
|
|
@ -50,6 +49,7 @@
|
||||||
icon="el-icon-search"
|
icon="el-icon-search"
|
||||||
@click="handleQuery"
|
@click="handleQuery"
|
||||||
></el-button>
|
></el-button>
|
||||||
|
<el-button type="warning" @click="expendChange">{{changeText}}</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-main class="nopadding">
|
<el-main class="nopadding">
|
||||||
|
|
|
||||||
|
|
@ -216,7 +216,8 @@
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :md="12" :sm="24" v-if="change_batch">
|
<el-col :md="12" :sm="24" v-if="change_batch">
|
||||||
<el-form-item label="新批次号" prop="new_batch">
|
<el-form-item label="新批次号" prop="new_batch">
|
||||||
<el-input v-model="form.new_batch" placeholder="新批次号" :disabled="type==50"></el-input>
|
<el-input v-model="form.new_batch" placeholder="新批次号" @change="new_batch(form.new_batch)" :disabled="type==50"></el-input>
|
||||||
|
<span style="color: red;">请手动录入新批次号,不要用已有批次!</span>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
@ -752,6 +753,7 @@ export default {
|
||||||
this.imputDisable = false;
|
this.imputDisable = false;
|
||||||
this.$refs.codeInput.focus();
|
this.$refs.codeInput.focus();
|
||||||
},
|
},
|
||||||
|
|
||||||
async getInputText(data){
|
async getInputText(data){
|
||||||
if(data==''){
|
if(data==''){
|
||||||
return;
|
return;
|
||||||
|
|
@ -923,6 +925,14 @@ export default {
|
||||||
this.countChange();
|
this.countChange();
|
||||||
}, 500);
|
}, 500);
|
||||||
},
|
},
|
||||||
|
new_batch(){
|
||||||
|
let that = this;
|
||||||
|
if(that.form.new_batch.indexOf('#')>-1){
|
||||||
|
that.form.new_batch = '';
|
||||||
|
that.$message.error("新批次号不能用以有批次需要手动录入新批次号!");
|
||||||
|
}
|
||||||
|
|
||||||
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue