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

Signed-off-by: TanYibin <5491541@qq.com>

入库单，出库单明细在新建状态才能编辑删除
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent c910edb4
Showing 3 changed files with 23 additions and 55 deletions
ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailList.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
@@ -77,15 +77,13 @@
             type="primary"
             icon="download"
             size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
+            @click="downloadFile(text)">下载</a-button>
         </template>
         <span slot="action" slot-scope="text, record">
-          <a v-has="'receiptDetail:edit'" @click="edit(record)">编辑</a>
+          <a v-has="'receiptDetail:edit'" v-if="record.status == 0 && record.referCode == null" @click="edit(record)">编辑</a>
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-            <a v-has="'receiptDetail:delete'"><a-divider type="vertical"/>删除</a>
+            <a v-has="'receiptDetail:delete'" v-if="record.status == 0 && record.referCode == null"><a-divider type="vertical"/>删除</a>
           </a-popconfirm>
         </span>
@@ -268,6 +266,9 @@ export default {
       this.$refs.modalEditForm.edit(record);
       this.$refs.modalEditForm.title = "编辑";
       this.$refs.modalEditForm.disableSubmit = false;
+      this.$refs.modalEditForm.$on("close", () => {
+        this.searchQuery();
+      });
     },
     batchPrint() {
@@ -60,49 +60,12 @@
           </a-tag>
         </span>
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt=""
-               style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
         <span slot="action" slot-scope="text, record">
-          <a  v-if="flowStatus=='15'&&flowStatus!='20'||flowOff=='0'" @click="combine(record)"><a-button type="primary">配盘</a-button></a>
-          <a-divider type="vertical"/>
-              <a-dropdown>
-                <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
-                <a-menu slot="overlay">
-                   <a-menu-item v-has="'shipmentDetail:edit'">
-                      <a @click="handleEdit(record)">编辑</a>
-                   </a-menu-item>
-                  <a-menu-item v-has="'shipmentDetail:delete'">
-                    <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                      <a>删除</a>
-                    </a-popconfirm>
-                  </a-menu-item>
-                </a-menu>
-              </a-dropdown>
-
-<!--          <a v-has="'shipmentDetail:edit'" @click="edit(record)">编辑</a>-->
-<!--          <a-divider type="vertical"/>-->
-<!--          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
-<!--         <a v-has="'shipmentDetail:delete'">删除</a>-->
-<!--          </a-popconfirm>-->
+          <a v-if=" (flowStatus == '15' && flowStatus != '20' && record.status <= 200) || (flowOff == '0' && record.status <= 200)" @click="combine(record)">配盘</a>
+          <a v-has="'shipmentDetail:edit'" v-if="record.status == 0 && record.referCode == null" @click="handleEdit(record)"><a-divider type="vertical"/>编辑</a>
+          <a-popconfirm v-has="'shipmentDetail:delete'" v-if="record.status == 0 && record.referCode == null" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a-divider type="vertical"/><a>删除</a>
+          </a-popconfirm>
         </span>
       </a-table>
@@ -110,8 +73,7 @@
     <shipmentDetail-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></shipmentDetail-modal>
     <shipment-detail-edit-modal ref="modalEditForm" @ok="modalFormOk" :mainId="mainId"></shipment-detail-edit-modal>
-    <shipment-detail-combine-modal ref="modalCombineForm" @ok="modalFormOk"
-                                   :mainId="mainId"></shipment-detail-combine-modal>
+    <shipment-detail-combine-modal ref="modalCombineForm" @ok="modalFormOk" :mainId="mainId"></shipment-detail-combine-modal>
   </a-card>
 </template>
@@ -309,11 +271,17 @@ export default {
       this.$refs.modalCombineForm.edit(record);
       this.$refs.modalCombineForm.title = "配盘";
       this.$refs.modalCombineForm.disableSubmit = false;
+      this.$refs.modalCombineForm.$on("close", () => {
+        this.searchQuery();
+      });
     },
     edit(record) {
       this.$refs.modalEditForm.edit(record);
       this.$refs.modalEditForm.title = "编辑";
       this.$refs.modalEditForm.disableSubmit = false;
+      this.$refs.modalEditForm.$on("close", () => {
+        this.searchQuery();
+      });
     },
   }
 }
@@ -194,8 +194,8 @@
           <a-popconfirm v-has="'shipmentHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)">
             <a><a-button type="default">回传</a-button><a-divider type="vertical"/></a>
           </a-popconfirm>
-          <a v-if="((record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus < 800))
-            || (flowOff == '0' && record.lastStatus < 800)" @click="autoShipmentCombine(record)" v-has="'shipmentHeader:autoShipmentCombine'"><a-button type="primary">自动配盘</a-button> <a-divider type="vertical"/></a>
+          <a v-if="((record.firstStatus >= 15 && record.firstStatus != '20' && record.lastStatus <= 200))
+            || (flowOff == '0' && record.lastStatus <= 200)" @click="autoShipmentCombine(record)" v-has="'shipmentHeader:autoShipmentCombine'"><a-button type="primary">自动配盘</a-button> <a-divider type="vertical"/></a>
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
@@ -213,7 +213,6 @@
             </a-menu>
           </a-dropdown>
         </span>
-
       </a-table>
     </div>
@@ -479,10 +478,10 @@ export default {
         this.searchQuery();
       });
     },
-    audit(record){
+    audit(record) {
       this.$refs.auditForm.edit(record,this.username)
     },
-    createAudit(record){
+    createAudit(record) {
       let params={
         shipmentId:record.id,
         type:record.type,
@@ -498,7 +497,7 @@ export default {
         }
       });
     },
-    openProcess(record){
+    openProcess(record) {
       this.$refs.porcessForm.edit(record,'2')
     },
     loadFrom() {