物理删除 gengdidi

gassafetyprogress-system/src/main/resources/mapper/system/TWorkOrderMapper.xml

@@ -70,7 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTWorkOrderList" parameterType="TWorkOrder" resultMap="TWorkOrderResult">
         <include refid="selectTWorkOrderVo"/>
-        <where>  
+        <where>
+            workOrder.is_del = '0'
             <if test="workTitle != null  and workTitle != ''"> and workOrder.work_title like concat('%', #{workTitle}, '%')</if>
             <if test="workType != null  and workType != ''"> and workOrder.work_type = #{workType}</if>
             <if test="workContent != null  and workContent != ''"> and workOrder.work_content = #{workContent}</if>

gassafetyprogress-web/src/views/inspectionWork/workOrder/components/HiddenFeedTrouble.vue

@@ -304,7 +304,8 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
-          return delHiddenInfo(hiddenTroubleId);
+          //return delHiddenInfo(hiddenTroubleId);
+           return updateHiddenInfo({hiddenTroubleId: hiddenTroubleId,isDel: '1'})
         }).then(() => {
         this.getHiddenInfoList({workId:this.workId});
         this.msgSuccess("删除成功");

gassafetyprogress-web/src/views/inspectionWork/workOrder/index.vue

@@ -347,7 +347,7 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="23">
+        <el-col :span="12">
           <el-form-item label="截止日期" prop="expiryDate">
             <el-date-picker clearable size="small"
                             v-model="form.expiryDate"
@@ -869,7 +869,8 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
-          return delOrder(workIds);
+          //return delOrder(workIds);
+          updateOrder({workId: workIds,isDel: '1'})
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");