修改删除

src/views/storehouse/inStockManage/inStockPlan/detailsPage.vue

@@ -64,7 +64,7 @@
                 <el-tabs v-model="activeName" type="card">
                     <el-tab-pane label="商品明细" name="sale_detail">
                         <avue-crud :option="optionContacts" ref="formContacts"
-                            :data="form.planItemsList.filter(item => item.isDeleted != 1)" :key="key"
+                            :data="form.planItemsList" :key="key"
                             @row-update="rowUpdate" @row-close="rowClose" :before-close="beforeClose"
                             @selection-change="selectionContacts"
                             @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.1)"
@@ -117,19 +117,21 @@
                                 <span v-else>{{ row.remarks }}</span>
                             </template>
                             <template slot-scope="{type,size,row,index,disabled}" slot="menu">
-                                <el-button :size="size" :disabled="editButton || form.status == 1" :type="type"
-                                    :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
+                                <el-button :size="size" :disabled="editButton || form.status == 1 || row.isDeleted == 1"
+                                    :type="type" :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
                                     @click="rowEdit(row, index)">{{ row.$cellEdit ? '保存' : '编辑' }}
                                 </el-button>
-                                <el-button icon="el-icon-delete" :size="size" :disabled="editButton || form.status == 1"
-                                    :type="type" @click="rowDel(row, index, 'planItemsList')">删除
+                                <el-button :icon="row.isDeleted == 1 ? 'el-icon-refresh-left' : 'el-icon-delete'"
+                                    :size="size" :disabled="editButton || form.status == 1" :type="type"
+                                    @click="rowDel(row, index, 'planItemsList')">{{ row.isDeleted == 1 ? '恢复' :
+                                        '删除' }}
                                 </el-button>
                             </template>
                         </avue-crud>
                     </el-tab-pane>
                     <el-tab-pane label="费用明细" name="outbound_records">
                         <avue-crud :option="optionOutboundRecords" ref="outbound_records"
-                            :data="form.centerShipCostList.filter(item => item.isDeleted != 1)" @row-update="rowUpdate"
+                            :data="form.centerShipCostList" @row-update="rowUpdate"
                             @resetColumn="resetColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 269.3)"
                             @saveColumn="saveColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 269.3)">
                             <template slot="indexHeader" slot-scope="{row,index}">
@@ -161,12 +163,14 @@
                                 <span v-else>{{ row.goodsNum }}</span>
                             </tempalte>
                             <template slot-scope="{type,size,row,index,disabled}" slot="menu">
-                                <el-button :size="size" :disabled="editButton || form.status == 1" :type="type"
-                                    :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
+                                <el-button :size="size" :disabled="editButton || form.status == 1 || row.isDeleted == 1"
+                                    :type="type" :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
                                     @click="rowEdit(row, index)">{{ row.$cellEdit ? '保存' : '编辑' }}
                                 </el-button>
-                                <el-button icon="el-icon-delete" :size="size" :disabled="editButton || form.status == 1"
-                                    :type="type" @click="rowDel(row, index, 'centerShipCostList')">删除
+                                <el-button :icon="row.isDeleted == 1 ? 'el-icon-refresh-left' : 'el-icon-delete'"
+                                    :size="size" :disabled="editButton || form.status == 1" :type="type"
+                                    @click="rowDel(row, index, 'centerShipCostList')">{{ row.isDeleted == 1 ? '恢复' :
+                                        '删除' }}
                                 </el-button>
                             </template>
                         </avue-crud>
@@ -1230,22 +1234,27 @@ export default {
             });
         },
         rowDel(row, index, list) {
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(() => {
-                if (row.id) {
-                    // itemRemove({ ids: row.id }).then(res => {
-                    //     this.form.planItemsList.splice(index, 1);
-                    //     this.$message.success("操作成功!");
-                    // });
-                    row.isDeleted = 1
-                } else {
-                    this.form[list].splice(index, 1);
+            if (row.isDeleted == 1) {
+                row.isDeleted = 0
+            } else {
+                this.$confirm("确定将选择数据删除?", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    if (row.id) {
+                        // itemRemove({ ids: row.id }).then(res => {
+                        //     this.form.planItemsList.splice(index, 1);
+                        //     this.$message.success("操作成功!");
+                        // });
+                        row.isDeleted = 1
+                        this.$set(row, '$cellEdit', false)
+                    } else {
+                        this.form[list].splice(index, 1);
+                    }
                 }
+                );
             }
-            );
         },
         // 明细信息多选
         selectionContacts(list) {

src/views/storehouse/outStockManage/outStockPlan/detailsPage.vue

@@ -64,7 +64,7 @@
                 <el-tabs v-model="activeName" type="card">
                     <el-tab-pane label="销售明细" name="sale_detail">
                         <avue-crud :option="optionContacts" v-model="formContacts" ref="formContacts"
-                            :data="form.planItemsList.filter(item => item.isDeleted != 1)" :key="key"
+                            :data="form.planItemsList" :key="key"
                             @row-close="rowClose" :before-close="beforeClose" @selection-change="selectionContacts"
                             @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.6)"
                             @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.6)">
@@ -109,19 +109,21 @@
                                 <span v-else>{{ row.remarks }}</span>
                             </template>
                             <template slot-scope="{type,size,row,index,disabled}" slot="menu">
-                                <el-button :size="size" :disabled="editButton || form.status == 2" :type="type"
-                                    :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
+                                <el-button :size="size" :disabled="editButton || form.status == 1 || row.isDeleted == 1"
+                                    :type="type" :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
                                     @click="rowEdit(row, index)">{{ row.$cellEdit ? '保存' : '编辑' }}
                                 </el-button>
-                                <el-button icon="el-icon-delete" :size="size" :disabled="form.status == 2" :type="type"
-                                    @click="rowDel(row, index, 'planItemsList')">删除
+                                <el-button :icon="row.isDeleted == 1 ? 'el-icon-refresh-left' : 'el-icon-delete'"
+                                    :size="size" :disabled="editButton || form.status == 1" :type="type"
+                                    @click="rowDel(row, index, 'planItemsList')">{{ row.isDeleted == 1 ? '恢复' :
+                                        '删除' }}
                                 </el-button>
                             </template>
                         </avue-crud>
                     </el-tab-pane>
                     <el-tab-pane label="收费明细" name="outbound_records">
                         <avue-crud :option="optionOutboundRecords" v-model="formContacts" ref="outbound_records"
-                            :data="form.centerShipCostList.filter(item => item.isDeleted != 1)"
+                            :data="form.centerShipCostList"
                             @resetColumn="resetColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 269.3)"
                             @saveColumn="saveColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 269.3)">
                             <template slot="indexHeader" slot-scope="{row,index}">
@@ -153,19 +155,21 @@
                                 <span v-else>{{ row.goodsNum }}</span>
                             </tempalte>
                             <template slot-scope="{type,size,row,index,disabled}" slot="menu">
-                                <el-button :size="size" :disabled="editButton || form.status == 2" :type="type"
-                                    :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
+                                <el-button :size="size" :disabled="editButton || form.status == 1 || row.isDeleted == 1"
+                                    :type="type" :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
                                     @click="rowEdit(row, index)">{{ row.$cellEdit ? '保存' : '编辑' }}
                                 </el-button>
-                                <el-button icon="el-icon-delete" :size="size" :disabled="editButton || form.status == 2"
-                                    :type="type" @click="rowDel(row, index, 'centerShipCostList')">删除
+                                <el-button :icon="row.isDeleted == 1 ? 'el-icon-refresh-left' : 'el-icon-delete'"
+                                    :size="size" :disabled="editButton || form.status == 1" :type="type"
+                                    @click="rowDel(row, index, 'centerShipCostList')">{{ row.isDeleted == 1 ? '恢复' :
+                                        '删除' }}
                                 </el-button>
                             </template>
                         </avue-crud>
                     </el-tab-pane>
                     <el-tab-pane label="付费明细" name="outbound_records2">
                         <avue-crud :option="optionOutboundRecords" v-model="formContacts" ref="outbound_records2"
-                            :data="form.centerShipPaymentCostList.filter(item => item.isDeleted != 1)"
+                            :data="form.centerShipPaymentCostList"
                             @resetColumn="resetColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 269.3)"
                             @saveColumn="saveColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 269.3)">
                             <template slot="indexHeader" slot-scope="{row,index}">
@@ -197,12 +201,14 @@
                                 <span v-else>{{ row.goodsNum }}</span>
                             </tempalte>
                             <template slot-scope="{type,size,row,index,disabled}" slot="menu">
-                                <el-button :size="size" :disabled="editButton || form.status == 2" :type="type"
-                                    :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
+                                <el-button :size="size" :disabled="editButton || form.status == 1 || row.isDeleted == 1"
+                                    :type="type" :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
                                     @click="rowEdit(row, index)">{{ row.$cellEdit ? '保存' : '编辑' }}
                                 </el-button>
-                                <el-button icon="el-icon-delete" :size="size" :disabled="editButton || form.status == 2"
-                                    :type="type" @click="rowDel(row, index, 'centerShipCostList')">删除
+                                <el-button :icon="row.isDeleted == 1 ? 'el-icon-refresh-left' : 'el-icon-delete'"
+                                    :size="size" :disabled="editButton || form.status == 1" :type="type"
+                                    @click="rowDel(row, index, 'centerShipPaymentCostList')">{{ row.isDeleted == 1 ? '恢复' :
+                                        '删除' }}
                                 </el-button>
                             </template>
                         </avue-crud>
@@ -1325,22 +1331,27 @@ export default {
             }
         },
         rowDel(row, index, list) {
-            this.$confirm("确定将选择数据删除?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(() => {
-                if (row.id) {
-                    // itemRemove({ ids: row.id }).then(res => {
-                    //     this.form.planItemsList.splice(index, 1);
-                    //     this.$message.success("操作成功!");
-                    // });
-                    row.isDeleted = 1
-                } else {
-                    this.form[list].splice(index, 1);
+            if (row.isDeleted == 1) {
+                row.isDeleted = 0
+            } else {
+                this.$confirm("确定将选择数据删除?", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                }).then(() => {
+                    if (row.id) {
+                        // itemRemove({ ids: row.id }).then(res => {
+                        //     this.form.planItemsList.splice(index, 1);
+                        //     this.$message.success("操作成功!");
+                        // });
+                        row.isDeleted = 1
+                        this.$set(row, '$cellEdit', false)
+                    } else {
+                        this.form[list].splice(index, 1);
+                    }
                 }
+                );
             }
-            );
         },
         // 明细信息多选
         selectionContacts(list) {