wms / wms4_jiangxikangshu · Commits

Commit 7dc2d5c8b5ae2efc0ea898b1c7c4d3938ac00dc3

Authored by 陈翱
2 parents bad35d31 63736709

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 7 changed files with 21 additions and 64 deletions
ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
  View file @7dc2d5c
... ... @@ -146,7 +146,7 @@
146 146 </a-tabs>
147 147  
148 148 <inventoryHeader-modal ref="modalForm" @ok="modalFormOk"></inventoryHeader-modal>
149   - <QuickShipmentModel ref='quickShipmentModel' @ok='quickShipmentModalFormOk'></QuickShipmentModel>
  149 + <QuickShipmentModel ref='quickShipmentModel'></QuickShipmentModel>
150 150 </a-card>
151 151 </template>
152 152  
... ...
ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
  View file @7dc2d5c
... ... @@ -62,13 +62,13 @@
62 62 <a-input placeholder="请输入物料编码" v-model="queryParam.materialCode"></a-input>
63 63 </a-form-item>
64 64 </a-col>
65   - <a-col :xl="6" :lg="7" :md="8" :sm="24">
66   - <a-form-item label="物料名称">
67   - <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
68   - </a-form-item>
69   - </a-col>
70 65 <template v-if="toggleSearchStatus">
71 66 <a-col :xl="6" :lg="7" :md="8" :sm="24">
  67 + <a-form-item label="物料名称">
  68 + <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"></a-input>
  69 + </a-form-item>
  70 + </a-col>
  71 + <a-col :xl="6" :lg="7" :md="8" :sm="24">
72 72 <a-form-item label="物料规格">
73 73 <a-input placeholder="请输入物料规格" v-model="queryParam.materialSpec"></a-input>
74 74 </a-form-item>
... ...
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerDetailList.vue
  View file @7dc2d5c
... ... @@ -71,26 +71,15 @@
71 71 @change="handleImportExcel">
72 72 <a-button type="primary" icon="import">导入</a-button>
73 73 </a-upload>
74   - <a-dropdown v-if="selectedRowKeys.length > 0">
75   - <a-menu slot="overlay" v-has="'receiptContainerDetail:deleteBatch'">
76   - <a-menu-item key="1" @click="batchDel">
77   - <a-icon type="delete"/>
78   - 删除
79   - </a-menu-item>
80   - </a-menu>
81   - <a-button style="margin-left: 8px"> 批量操作
82   - <a-icon type="down"/>
83   - </a-button>
84   - </a-dropdown>
85 74 </div>
86 75  
87 76 <!-- table区域-begin -->
88 77 <div>
89   - <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
  78 + <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
90 79 <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
91 80 style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
92 81 <a style="margin-left: 24px" @click="onClearSelected">清空</a>
93   - </div>
  82 + </div> -->
94 83  
95 84 <a-table
96 85 ref="table"
... ... @@ -102,7 +91,6 @@
102 91 :dataSource="dataSource"
103 92 :pagination="ipagination"
104 93 :loading="loading"
105   - :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
106 94 @change="handleTableChange">
107 95  
108 96 <span slot="companyCode" slot-scope="companyCode">
... ...
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
  View file @7dc2d5c
... ... @@ -305,7 +305,9 @@ export default {
305 305 this.selectedMainId = ''
306 306 },
307 307 onSelectChange(selectedRowKeys, selectionRows) {
308   - this.selectedMainId = selectedRowKeys[0].toString();
  308 + if (selectedRowKeys.length > 0) {
  309 + this.selectedMainId = selectedRowKeys[0].toString();
  310 + }
309 311 this.selectedRowKeys = selectedRowKeys;
310 312 this.selectionRows = selectionRows;
311 313 },
... ...
ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerDetailList.vue
  View file @7dc2d5c
... ... @@ -71,26 +71,15 @@
71 71 @change="handleImportExcel">
72 72 <a-button type="primary" icon="import">导入</a-button>
73 73 </a-upload>
74   - <a-dropdown v-if="selectedRowKeys.length > 0">
75   - <a-menu slot="overlay" v-has="'shipmentContainerDetail:deleteBatch'">
76   - <a-menu-item key="1" @click="batchDel">
77   - <a-icon type="delete"/>
78   - 删除
79   - </a-menu-item>
80   - </a-menu>
81   - <a-button style="margin-left: 8px"> 批量操作
82   - <a-icon type="down"/>
83   - </a-button>
84   - </a-dropdown>
85 74 </div>
86 75  
87 76 <!-- table区域-begin -->
88 77 <div>
89   - <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
  78 + <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
90 79 <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
91 80 style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
92 81 <a style="margin-left: 24px" @click="onClearSelected">清空</a>
93   - </div>
  82 + </div> -->
94 83  
95 84 <a-table
96 85 ref="table"
... ... @@ -102,7 +91,6 @@
102 91 :dataSource="dataSource"
103 92 :pagination="ipagination"
104 93 :loading="loading"
105   - :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
106 94 @change="handleTableChange">
107 95  
108 96 <span slot="companyCode" slot-scope="companyCode">
... ...
ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
  View file @7dc2d5c
... ... @@ -101,26 +101,6 @@
101 101 :customRow="clickThenSelect"
102 102 @change="handleTableChange">
103 103  
104   - <template slot="htmlSlot" slot-scope="text">
105   - <div v-html="text"></div>
106   - </template>
107   - <template slot="imgSlot" slot-scope="text">
108   - <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
109   - <img v-else :src="getImgView(text)" height="25px" alt=""
110   - style="max-width:80px;font-size: 12px;font-style: italic;"/>
111   - </template>
112   - <template slot="fileSlot" slot-scope="text">
113   - <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
114   - <a-button
115   - v-else
116   - :ghost="true"
117   - type="primary"
118   - icon="download"
119   - size="small"
120   - @click="downloadFile(text)">下载
121   - </a-button>
122   - </template>
123   -
124 104 <span slot="action" slot-scope="text, record">
125 105 <a v-if="record.status == 0" @click="selectPort(record)">生成任务<a-divider type="vertical"/></a>
126 106 <a-popconfirm v-if="record.status == 0" v-has="'shipmentContainerHeader:delete'" title="确定取消配盘吗?" @confirm="() => handleDelete(record.id)">
... ... @@ -282,7 +262,9 @@ export default {
282 262 this.selectedMainId = ''
283 263 },
284 264 onSelectChange(selectedRowKeys, selectionRows) {
285   - this.selectedMainId = selectedRowKeys[0].toString();
  265 + if (selectedRowKeys.length > 0) {
  266 + this.selectedMainId = selectedRowKeys[0].toString();
  267 + }
286 268 this.selectedRowKeys = selectedRowKeys;
287 269 this.selectionRows = selectionRows;
288 270 },
... ...
ant-design-vue-jeecg/src/views/system/task/TaskDetailList.vue
  View file @7dc2d5c
... ... @@ -3,7 +3,7 @@
3 3 <!-- 操作按钮区域 -->
4 4 <div class="table-operator" v-if="mainId">
5 5 <a-button @click="handleAdd" v-has="'taskDetail:add'" type="primary" icon="plus">新增</a-button>
6   - <a-button type="primary" icon="download" @click="handleExportXls('任务详情')">导出</a-button>
  6 + <!-- <a-button type="primary" icon="download" @click="handleExportXls('任务详情')">导出</a-button>
7 7 <a-upload
8 8 name="file"
9 9 :showUploadList="false"
... ... @@ -12,12 +12,11 @@
12 12 :action="importExcelUrl"
13 13 @change="handleImportExcel">
14 14 <a-button type="primary" icon="import">导入</a-button>
15   - </a-upload>
  15 + </a-upload> -->
16 16 <a-dropdown v-if="selectedRowKeys.length > 0">
17 17 <a-menu slot="overlay" v-has="'taskDetail:deleteBatch'">
18 18 <a-menu-item key="1" @click="batchDel">
19   - <a-icon type="delete"/>
20   - 删除
  19 + <a-icon type="delete"/> 删除
21 20 </a-menu-item>
22 21 </a-menu>
23 22 <a-button style="margin-left: 8px"> 批量操作
... ... @@ -28,11 +27,11 @@
28 27  
29 28 <!-- table区域-begin -->
30 29 <div>
31   - <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
  30 + <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
32 31 <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
33 32 style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
34 33 <a style="margin-left: 24px" @click="onClearSelected">清空</a>
35   - </div>
  34 + </div> -->
36 35  
37 36 <a-table
38 37 ref="table"
... ... @@ -44,7 +43,6 @@
44 43 :dataSource="dataSource"
45 44 :pagination="ipagination"
46 45 :loading="loading"
47   - :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
48 46 @change="handleTableChange">
49 47  
50 48 <span slot='companyCode' slot-scope='companyCode'>
... ... @@ -77,7 +75,6 @@
77 75 <span slot="action" slot-scope="text, record">
78 76 <adjustment-doc-modal ref="adjustmentModal" @ok="modalFormOk" :id="record.id" :taskHeaderId="record.taskHeaderId"/>
79 77 <a v-if="record.taskType==700" @click="createMany(record)">实盘登记</a>
80   - <a-divider type="vertical" v-if="record.taskType==700" />
81 78 <a v-has="'taskDetail:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical" /></a>
82 79 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
83 80 <a v-has="'taskDetail:delete'">删除</a>
... ...