Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/customerBuler-crm/src/components/relatedProducts/relatedProducts.vue

@@ -124,8 +124,9 @@ function returnData() {
 }
 
 watchEffect(() => {
-    const { productTableList, height } = props
+    const { productTableList, height, productTableListValue = [] } = props
     productArrar.value = productTableList || []
+    productTable.value = productTableListValue.length > 0 ? productTableListValue : [{ index: 0 }]
     heightClass.value = !height ? '200px' : height
 });
 

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/business/component/stageSetting.vue

@@ -29,7 +29,7 @@
                         <el-table-column label="操作" fixed="right" width="200">
                             <template #default="scope">
                                 <el-button link type="primary" size="large" @click="addStage(scope.row)">编辑</el-button>
-                                <el-button link type="danger" size="large" @click="deteStage(+scope.$index)">删除</el-button>
+                                <el-button link type="danger" size="large" @click="deteStage(+scope.$index)" :disabled="scope.row.isFinish == 1">删除</el-button>
                                 <el-button link type="primary" size="large" @click="moveStage(+scope.$index, 'up')"
                                     v-if="scope.$index != 0">上移</el-button>
                                 <el-button link type="primary" size="large" @click="moveStage(+scope.$index, 'down')"

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/BusinessOpportunityController.java

@@ -223,6 +223,9 @@ public class BusinessOpportunityController {
     @RequestMapping("saveStage")
     public HttpRespMsg insertStage(String stages, HttpServletRequest request) {
         return stageService.changeStage(stages,request);
+    }   @RequestMapping("deleteStage")
+    public HttpRespMsg deleteStage(Stage stage) {
+        return stageService.deleteStage(stage);
     }
     @RequestMapping("getStage")
     public HttpRespMsg Stage(HttpServletRequest request) {

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/StageService.java

@@ -20,4 +20,6 @@ public interface StageService extends IService<Stage> {
     HttpRespMsg changeStage(String stages, HttpServletRequest request);
 
     HttpRespMsg getStage(HttpServletRequest request);
+
+    HttpRespMsg deleteStage(Stage stage);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/StageServiceImpl.java

@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.management.platform.entity.BusinessOpportunity;
 import com.management.platform.entity.CustomerInfo;
 import com.management.platform.entity.Stage;
 import com.management.platform.entity.User;
+import com.management.platform.mapper.BusinessOpportunityMapper;
 import com.management.platform.mapper.StageMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.StageService;
@@ -34,6 +36,8 @@ public class StageServiceImpl extends ServiceImpl<StageMapper, Stage> implements
     @Autowired
     private StageMapper stageMapper;
     @Autowired
+    private BusinessOpportunityMapper boMapper;
+    @Autowired
     private UserMapper userMapper;
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -56,10 +60,27 @@ public class StageServiceImpl extends ServiceImpl<StageMapper, Stage> implements
         return msg;
     }
 
+
+
+
     @Override
     public HttpRespMsg getStage(HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
         msg.setData(stageMapper.selectList(new QueryWrapper<Stage>().eq("company_id",userMapper.selectById(request.getHeader("Token")).getCompanyId()).orderBy(true, true, "seq")));
         return msg;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public HttpRespMsg deleteStage(Stage stage) {
+        Integer i = boMapper.selectCount(new QueryWrapper<BusinessOpportunity>().eq("stage_id", stage.getId()));
+        HttpRespMsg msg = new HttpRespMsg();
+        if (i > 0){
+            msg.setError("此阶段已使用");
+            return msg;
+        }
+        stageMapper.deleteById(stage.getId());
+        msg.setMsg("操作成功");
+        return msg;
+    }
 }