|
@@ -27,12 +27,12 @@
|
|
|
</a-form-model-item>
|
|
|
</a-form-model>
|
|
|
<div class="table-operator">
|
|
|
- <a-button type="primary" @click="createAndPrint" style="width: 240px;height:60px;margin-left: 600px;" size="large">
|
|
|
+ <a-button type="primary" @click="createAndPrint" style="width: 120px;height:40px" size="large">
|
|
|
创建并打印
|
|
|
</a-button>
|
|
|
- <a-button type="primary" @click="print" style="height:60px;width: 100px;margin-left: 500px" size="large">
|
|
|
- 补打
|
|
|
- </a-button>
|
|
|
+<!-- <a-button type="primary" @click="print" style="height:60px;width: 100px;margin-left: 480px" size="large">-->
|
|
|
+<!-- 补打-->
|
|
|
+<!-- </a-button>-->
|
|
|
</div>
|
|
|
<a-table :columns="columns" :data-source="list" :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: handleChangeV1 }" size="default"
|
|
|
:customHeaderRow="customHeaderRow" :custom-row="customRow" :pagination="pagination" @change="tablePaginationChange" >
|
|
@@ -61,7 +61,7 @@ import {sendPrintSock, webSock} from "../../store/modules/hrPrint";
|
|
|
|
|
|
const columns = [
|
|
|
{
|
|
|
- width: 50,
|
|
|
+ width: 60,
|
|
|
title: '序号',
|
|
|
scopedSlots: {customRender: 'serial'}
|
|
|
},
|
|
@@ -215,7 +215,7 @@ export default {
|
|
|
return;
|
|
|
} else {
|
|
|
res.data.data.forEach(order => {
|
|
|
- order.key = order.zresno
|
|
|
+ order.key = order.zorderno
|
|
|
order.kwmeng = 0
|
|
|
order.arktx = ''
|
|
|
order.items.forEach(item => {
|
|
@@ -545,6 +545,7 @@ export default {
|
|
|
.then(function (res) {
|
|
|
if (Number(res.data.code) === 200) {
|
|
|
self.searchModel.identityCard = res.data.message
|
|
|
+ self.search();
|
|
|
clearInterval(intervalId);
|
|
|
return;
|
|
|
}
|
|
@@ -585,6 +586,7 @@ export default {
|
|
|
console.log(res)
|
|
|
if (Number(res.data.code) === 200) {
|
|
|
self.searchModel.identityCard = res.data.message
|
|
|
+ self.search();
|
|
|
clearInterval(intervalId);
|
|
|
}
|
|
|
if (self.searchModel.identityCard !== undefined && self.searchModel.identityCard !== null && self.searchModel.identityCard !== '') {
|