Merge remote-tracking branch 'origin/dev' into dev2.0

src/api/inventory/deviceInspectTake.js

@@ -64,6 +64,14 @@ export function delectDeviceInspecTake(data) {
     });
 }
 
+export function delectDeviceInspecTakeDetail(params) {
+    return axios({
+        url: "/udiwms/inv/device/inspect/take/detail/delectDeviceInspecTakeDetail",
+        method: "get",
+        params: params
+    });
+}
+
 
 
 

src/views/inventory/DeviceInspectTakeAdd.vue

@@ -199,15 +199,13 @@
         </el-table-column>
         <el-table-column label="操作" width="200">
           <template slot-scope="scope">
-            <el-button type="text" size="small" v-if="type != 3" @click.native.stop="editDialog(scope.row,'edit')">
-              编辑
-            </el-button>
+            <el-button type="text" size="small" v-if="type != 3" @click.native.stop="editDialog(scope.row,'edit')">编辑</el-button>
             <el-button type="text" size="small" @click.native.stop="editDialog(scope.row,'detail')">详情</el-button>
+            <el-button type="text" size="small" @click.native.stop="delectPlanFunction(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
-
     <el-dialog
         :title="name"
         :visible.sync="inspectTakeSetVisible"
@@ -315,6 +313,7 @@ import {getInvListByUser, warehouseUserList} from "@/api/system/invWarehouse";
 import {saveDeviceInspectPlan, updateStatus} from "@/api/inventory/deviceInspectPlan";
 import DeviceInspectTakeProjectSet from "@/views/inventory/DeviceInspectTakeProjectSet"
 import {
+  delectDeviceInspecTakeDetail,
   saveDeviceInspectTake,
   selectDeviceInspecTakeDetail,
   uploadDeviceTake
@@ -676,7 +675,17 @@ export default {
         this.editType = 3;
       }
     },
-
+    delectPlanFunction(row) {
+      delectDeviceInspecTakeDetail({id: row.id}).then((res) => {
+        if (res.code == 20000) {
+          this.selectDeviceInspecTakeDetail({taskOrderIdFk: this.inspectTake.orderId});
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+      })
+    },
     showImgViewer(row) {
       if (row.inspectImage.substr(-1) == ',') {
         row.inspectImage = row.inspectImage.slice(0, row.inspectImage.length - 1);

src/views/inventory/DeviceInspectTakeAuditModify.vue

@@ -166,6 +166,7 @@
               编辑
             </el-button>
             <el-button type="text" size="small" @click.native.stop="editDialog(scope.row,'detail')">详情</el-button>
+            <el-button type="text" size="small" @click.native.stop="delectPlanFunction(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -217,6 +218,7 @@ import {getInvListByUser, warehouseUserList} from "@/api/system/invWarehouse";
 import {saveDeviceInspectPlan, updateStatus} from "@/api/inventory/deviceInspectPlan";
 import DeviceInspectTakeProjectSet from "@/views/inventory/DeviceInspectTakeProjectSet"
 import {
+  delectDeviceInspecTakeDetail,
   saveDeviceInspectTake,
   selectDeviceInspecTakeDetail,
   uploadDeviceInspecTake
@@ -347,7 +349,17 @@ export default {
       }else
         this.ischeck = false;
     },
-
+    delectPlanFunction(row) {
+      delectDeviceInspecTakeDetail({id: row.id}).then((res) => {
+        if (res.code == 20000) {
+          this.selectDeviceInspecTakeDetail({taskOrderIdFk: this.inspectTake.orderId});
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+      })
+    },
 
     selectDeviceInspecTakeDetail(obj) {
       selectDeviceInspecTakeDetail(obj).then((res) => {