aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend

Browse Source
This commit is contained in:
linfso 2024-06-29 11:34:24 +08:00
commit cb9b42c31b
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/emis/emisTmsScanRecord/takeDeliveryScan.vue
View File

@ -7,7 +7,8 @@
<span slot="label"> <span slot="label">
<span style="color: red">{{ $t('提货人') }}</span> <span style="color: red">{{ $t('提货人') }}</span>
</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-form-item>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
@ -84,7 +85,8 @@
<span>{{ parseTime(scope.row.scanDate) }}</span> <span>{{ parseTime(scope.row.scanDate) }}</span>
</template> </template>
</el-table-column> </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-column :label="$t('重量')" align="center" prop="scanWeight" min-width="100" /> -->
<!-- </el-table> --> <!-- </el-table> -->
</xd-table> </xd-table>
@ -257,7 +259,7 @@ export default {
} }
let scanInfo = { let scanInfo = {
scanType:"51", scanType:"90",
opType:1, opType:1,
scanData:scList scanData:scList
}; };
@ -275,7 +277,7 @@ export default {
return; return;
} }
this.form.scanType = '51'; this.form.scanType = '90';
this.form.scanDate = parseTime(new Date()); this.form.scanDate = parseTime(new Date());
let record =Object.assign({}, this.form) let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode; 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) console.log(scanInfo)
doScan(scanInfo).then(response => { doScan(scanInfo).then(response => {
@ -417,7 +419,7 @@ export default {
// 检查 // 检查
let scanInfo = { let scanInfo = {
scanType:"51", scanType:"90",
opType:1, opType:1,
scanData:[ scanData:[
{ {
@ -437,7 +439,7 @@ export default {
return; return;
} }
this.form.scanType = '51'; this.form.scanType = '90';
this.form.scanDate = new Date(); this.form.scanDate = new Date();
let record =Object.assign({}, this.form) let record =Object.assign({}, this.form)
record.billCode=scanRstItem.billCode; record.billCode=scanRstItem.billCode;