fix:禅道371,372
This commit is contained in:
parent
0902cf8c42
commit
80c20c222b
|
|
@ -24,7 +24,7 @@
|
||||||
@change="formWminChange(wm_in)"
|
@change="formWminChange(wm_in)"
|
||||||
style="width: 300px;margin-left: 10px;"
|
style="width: 300px;margin-left: 10px;"
|
||||||
></el-input>
|
></el-input>
|
||||||
<!-- <scScanner @scanResult="formWminChange"></scScanner> -->
|
<scScanner @scanResult="codeTextChange" v-if="project_code!=='bxerp'"></scScanner>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="总计:">
|
<el-form-item label="总计:">
|
||||||
{{ totalCount }}
|
{{ totalCount }}
|
||||||
|
|
@ -373,6 +373,7 @@ export default {
|
||||||
},
|
},
|
||||||
wm_in:"",
|
wm_in:"",
|
||||||
route_code: "",
|
route_code: "",
|
||||||
|
project_code:'',
|
||||||
materials:[],
|
materials:[],
|
||||||
totalCount: 0,
|
totalCount: 0,
|
||||||
deptID:'',
|
deptID:'',
|
||||||
|
|
@ -395,6 +396,8 @@ export default {
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
let that = this;
|
let that = this;
|
||||||
|
let config_base = that.$TOOL.data.get("BASE_INFO").base;
|
||||||
|
that.project_code = config_base.base_code;
|
||||||
let arr = that.$route.path.split("/");
|
let arr = that.$route.path.split("/");
|
||||||
that.route_code = arr[2];
|
that.route_code = arr[2];
|
||||||
that.form.type = that.type;
|
that.form.type = that.type;
|
||||||
|
|
@ -642,6 +645,10 @@ export default {
|
||||||
this.form.handoverb.splice(index,1);
|
this.form.handoverb.splice(index,1);
|
||||||
this.countChange();
|
this.countChange();
|
||||||
},
|
},
|
||||||
|
codeTextChange(text){
|
||||||
|
this.wm_in = text;
|
||||||
|
this.formWminChange(text);
|
||||||
|
},
|
||||||
//显示
|
//显示
|
||||||
open(mode = "add",data,mtype) {
|
open(mode = "add",data,mtype) {
|
||||||
let that = this;
|
let that = this;
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
style="padding: 0 10px"
|
style="padding: 0 10px"
|
||||||
>
|
>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col>
|
<el-col :span="project_code!=='bxerp'?22:24">
|
||||||
<el-form-item label="扫码:">
|
<el-form-item label="扫码:">
|
||||||
<el-input
|
<el-input
|
||||||
class="inputWrap"
|
class="inputWrap"
|
||||||
|
|
@ -26,11 +26,14 @@
|
||||||
v-model="wm_in"
|
v-model="wm_in"
|
||||||
clearable
|
clearable
|
||||||
@change="formWminChange(wm_in)"
|
@change="formWminChange(wm_in)"
|
||||||
style="width: 100%;top: -7px;ime-mode:active"
|
style="width: 100%;ime-mode:active"
|
||||||
></el-input>
|
></el-input>
|
||||||
<span style="color: red;line-height: 12px;font-size: 14px;">*请扫同一批次的物料码</span>
|
<span style="color: red;line-height: 12px;font-size: 14px;">*请扫同一批次的物料码</span>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
<el-col :span="2" v-if="project_code!=='bxerp'">
|
||||||
|
<scScanner style="top: -7px" @scanResult="codeTextChange"></scScanner>
|
||||||
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :md="12" :sm="12" :xs="24">
|
<el-col :md="12" :sm="12" :xs="24">
|
||||||
|
|
@ -262,6 +265,7 @@ export default {
|
||||||
route_code:"",
|
route_code:"",
|
||||||
imageUrl:'',
|
imageUrl:'',
|
||||||
test_file:'',
|
test_file:'',
|
||||||
|
project_code:'',
|
||||||
visible: false,
|
visible: false,
|
||||||
isSaveing: false,
|
isSaveing: false,
|
||||||
batchCountCando:0,
|
batchCountCando:0,
|
||||||
|
|
@ -278,6 +282,8 @@ export default {
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
let that = this;
|
let that = this;
|
||||||
|
let config_base = that.$TOOL.data.get("BASE_INFO").base;
|
||||||
|
that.project_code = config_base.base_code;
|
||||||
this.route_code = this.$route.path.split("/")[2];
|
this.route_code = this.$route.path.split("/")[2];
|
||||||
this.form.handle_date = this.$TOOL.dateFormat2(new Date());
|
this.form.handle_date = this.$TOOL.dateFormat2(new Date());
|
||||||
// this.form.work_start_time = this.$TOOL.dateFormat(new Date());
|
// this.form.work_start_time = this.$TOOL.dateFormat(new Date());
|
||||||
|
|
@ -341,6 +347,10 @@ export default {
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
codeTextChange(text){
|
||||||
|
this.wm_in = text;
|
||||||
|
this.formWminChange(text);
|
||||||
|
},
|
||||||
//显示
|
//显示
|
||||||
open(mode = "add") {
|
open(mode = "add") {
|
||||||
let that = this;
|
let that = this;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue