Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend
This commit is contained in:
commit
cb9b42c31b
@ -7,7 +7,8 @@
|
||||
<span slot="label">
|
||||
<span style="color: red">{{ $t('提货人') }}</span>
|
||||
</span>
|
||||
<EmisUserSimplePicker v-model="form.pickMan" postCode="RSD" @onChange="onStaffSelect" ></EmisUserSimplePicker>
|
||||
<!-- <EmisUserSimplePicker v-model="form.pickMan" postCode="RSD" @onChange="onStaffSelect" ></EmisUserSimplePicker> -->
|
||||
<el-input v-model="form.pickMan"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="7">
|
||||
@ -84,7 +85,8 @@
|
||||
<span>{{ parseTime(scope.row.scanDate) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('提货人')" align="center" prop="pickManName" min-width="100" />
|
||||
<!-- <el-table-column :label="$t('提货人')" align="center" prop="pickManName" min-width="100" /> -->
|
||||
<el-table-column :label="$t('提货人')" align="center" prop="pickMan" min-width="100" />
|
||||
<!-- <el-table-column :label="$t('重量')" align="center" prop="scanWeight" min-width="100" /> -->
|
||||
<!-- </el-table> -->
|
||||
</xd-table>
|
||||
@ -257,7 +259,7 @@ export default {
|
||||
}
|
||||
|
||||
let scanInfo = {
|
||||
scanType:"51",
|
||||
scanType:"90",
|
||||
opType:1,
|
||||
scanData:scList
|
||||
};
|
||||
@ -275,7 +277,7 @@ export default {
|
||||
return;
|
||||
}
|
||||
|
||||
this.form.scanType = '51';
|
||||
this.form.scanType = '90';
|
||||
this.form.scanDate = parseTime(new Date());
|
||||
let record =Object.assign({}, this.form)
|
||||
record.billCode=scanRstItem.billCode;
|
||||
@ -362,7 +364,7 @@ export default {
|
||||
});
|
||||
|
||||
// 检查
|
||||
let scanInfo = {scanType:"51",opType:2,scanData:scanData}
|
||||
let scanInfo = {scanType:"90",opType:2,scanData:scanData}
|
||||
console.log(scanInfo)
|
||||
|
||||
doScan(scanInfo).then(response => {
|
||||
@ -417,7 +419,7 @@ export default {
|
||||
|
||||
// 检查
|
||||
let scanInfo = {
|
||||
scanType:"51",
|
||||
scanType:"90",
|
||||
opType:1,
|
||||
scanData:[
|
||||
{
|
||||
@ -437,7 +439,7 @@ export default {
|
||||
return;
|
||||
}
|
||||
|
||||
this.form.scanType = '51';
|
||||
this.form.scanType = '90';
|
||||
this.form.scanDate = new Date();
|
||||
let record =Object.assign({}, this.form)
|
||||
record.billCode=scanRstItem.billCode;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user