wms / wms4_jiangxikangshu · Commits

Commit 11b058936b310a26e3b0d59798a014c864791b6f

Authored by 谭毅彬
1 parent c910edb4

入库单，出库单明细在新建状态才能编辑删除 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 3 changed files with 23 additions and 55 deletions
ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue
  View file @11b0589
... ... @@ -77,15 +77,13 @@
77 77 type="primary"
78 78 icon="download"
79 79 size="small"
80   - @click="downloadFile(text)">
81   - 下载
82   - </a-button>
  80 + @click="downloadFile(text)">下载</a-button>
83 81 </template>
84 82  
85 83 <span slot="action" slot-scope="text, record">
86   - <a v-has="'receiptDetail:edit'" @click="edit(record)">编辑</a>
  84 + <a v-has="'receiptDetail:edit'" v-if="record.status == 0 && record.referCode == null" @click="edit(record)">编辑</a>
87 85 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
88   - <a v-has="'receiptDetail:delete'"><a-divider type="vertical"/>删除</a>
  86 + <a v-has="'receiptDetail:delete'" v-if="record.status == 0 && record.referCode == null"><a-divider type="vertical"/>删除</a>
89 87 </a-popconfirm>
90 88 </span>
91 89  
... ... @@ -268,6 +266,9 @@ export default {
268 266 this.$refs.modalEditForm.edit(record);
269 267 this.$refs.modalEditForm.title = "编辑";
270 268 this.$refs.modalEditForm.disableSubmit = false;
  269 + this.$refs.modalEditForm.$on("close", () => {
  270 + this.searchQuery();
  271 + });
271 272 },
272 273  
273 274 batchPrint() {
... ...
ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailList.vue
  View file @11b0589
... ... @@ -60,49 +60,12 @@
60 60 </a-tag>
61 61 </span>
62 62  
63   - <template slot="htmlSlot" slot-scope="text">
64   - <div v-html="text"></div>
65   - </template>
66   - <template slot="imgSlot" slot-scope="text">
67   - <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
68   - <img v-else :src="getImgView(text)" height="25px" alt=""
69   - style="max-width:80px;font-size: 12px;font-style: italic;"/>
70   - </template>
71   - <template slot="fileSlot" slot-scope="text">
72   - <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
73   - <a-button
74   - v-else
75   - :ghost="true"
76   - type="primary"
77   - icon="download"
78   - size="small"
79   - @click="downloadFile(text)">
80   - 下载
81   - </a-button>
82   - </template>
83   -
84 63 <span slot="action" slot-scope="text, record">
85   - <a v-if="flowStatus=='15'&&flowStatus!='20'||flowOff=='0'" @click="combine(record)"><a-button type="primary">配盘</a-button></a>
86   - <a-divider type="vertical"/>
87   - <a-dropdown>
88   - <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
89   - <a-menu slot="overlay">
90   - <a-menu-item v-has="'shipmentDetail:edit'">
91   - <a @click="handleEdit(record)">编辑</a>
92   - </a-menu-item>
93   - <a-menu-item v-has="'shipmentDetail:delete'">
94   - <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
95   - <a>删除</a>
96   - </a-popconfirm>
97   - </a-menu-item>
98   - </a-menu>
99   - </a-dropdown>
100   -
101   -<!-- <a v-has="'shipmentDetail:edit'" @click="edit(record)">编辑</a>-->
102   -<!-- <a-divider type="vertical"/>-->
103   -<!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
104   -<!-- <a v-has="'shipmentDetail:delete'">删除</a>-->
105   -<!-- </a-popconfirm>-->
  64 + <a v-if=" (flowStatus == '15' && flowStatus != '20' && record.status <= 200) || (flowOff == '0' && record.status <= 200)" @click="combine(record)">配盘</a>
  65 + <a v-has="'shipmentDetail:edit'" v-if="record.status == 0 && record.referCode == null" @click="handleEdit(record)"><a-divider type="vertical"/>编辑</a>
  66 + <a-popconfirm v-has="'shipmentDetail:delete'" v-if="record.status == 0 && record.referCode == null" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
  67 + <a-divider type="vertical"/><a>删除</a>
  68 + </a-popconfirm>
106 69 </span>
107 70  
108 71 </a-table>
... ... @@ -110,8 +73,7 @@
110 73  
111 74 <shipmentDetail-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></shipmentDetail-modal>
112 75 <shipment-detail-edit-modal ref="modalEditForm" @ok="modalFormOk" :mainId="mainId"></shipment-detail-edit-modal>
113   - <shipment-detail-combine-modal ref="modalCombineForm" @ok="modalFormOk"
114   - :mainId="mainId"></shipment-detail-combine-modal>
  76 + <shipment-detail-combine-modal ref="modalCombineForm" @ok="modalFormOk" :mainId="mainId"></shipment-detail-combine-modal>
115 77  
116 78 </a-card>
117 79 </template>
... ... @@ -309,11 +271,17 @@ export default {
309 271 this.$refs.modalCombineForm.edit(record);
310 272 this.$refs.modalCombineForm.title = "配盘";
311 273 this.$refs.modalCombineForm.disableSubmit = false;
  274 + this.$refs.modalCombineForm.$on("close", () => {
  275 + this.searchQuery();
  276 + });
312 277 },
313 278 edit(record) {
314 279 this.$refs.modalEditForm.edit(record);
315 280 this.$refs.modalEditForm.title = "编辑";
316 281 this.$refs.modalEditForm.disableSubmit = false;
  282 + this.$refs.modalEditForm.$on("close", () => {
  283 + this.searchQuery();
  284 + });
317 285 },
318 286 }
319 287 }
... ...
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
  View file @11b0589
... ... @@ -194,8 +194,8 @@
194 194 <a-popconfirm v-has="'shipmentHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)">
195 195 <a><a-button type="default">回传</a-button><a-divider type="vertical"/></a>
196 196 </a-popconfirm>
197   - <a v-if="((record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus < 800))
198   - || (flowOff == '0' && record.lastStatus < 800)" @click="autoShipmentCombine(record)" v-has="'shipmentHeader:autoShipmentCombine'"><a-button type="primary">自动配盘</a-button> <a-divider type="vertical"/></a>
  197 + <a v-if="((record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus <= 200))
  198 + || (flowOff == '0' && record.lastStatus <= 200)" @click="autoShipmentCombine(record)" v-has="'shipmentHeader:autoShipmentCombine'"><a-button type="primary">自动配盘</a-button> <a-divider type="vertical"/></a>
199 199 <a-dropdown>
200 200 <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
201 201 <a-menu slot="overlay">
... ... @@ -213,7 +213,6 @@
213 213 </a-menu>
214 214 </a-dropdown>
215 215 </span>
216   -
217 216 </a-table>
218 217 </div>
219 218  
... ... @@ -479,10 +478,10 @@ export default {
479 478 this.searchQuery();
480 479 });
481 480 },
482   - audit(record){
  481 + audit(record) {
483 482 this.$refs.auditForm.edit(record,this.username)
484 483 },
485   - createAudit(record){
  484 + createAudit(record) {
486 485 let params={
487 486 shipmentId:record.id,
488 487 type:record.type,
... ... @@ -498,7 +497,7 @@ export default {
498 497 }
499 498 });
500 499 },
501   - openProcess(record){
  500 + openProcess(record) {
502 501 this.$refs.porcessForm.edit(record,'2')
503 502 },
504 503 loadFrom() {
... ...