Переглянути джерело

规范命名+,修改材料价格库数据同步引用错误

lw 1 рік тому
батько
коміт
71ed80d67f
25 змінених файлів з 125 додано та 1745 видалено
  1. 39 33
      module_kzks/src/main/java/org/jeecg/dataSync/task/MaterialProcurementDataSync.java
  2. 4 0
      module_kzks/src/main/java/org/jeecg/modules/costModelClPrice/mapper/CostModelClPriceMapper.java
  3. 1 0
      module_kzks/src/main/java/org/jeecg/modules/costModelClPrice/service/ICostModelClPriceService.java
  4. 5 0
      module_kzks/src/main/java/org/jeecg/modules/costModelClPrice/service/impl/CostModelClPriceServiceImpl.java
  5. 13 13
      module_kzks/src/main/java/org/jeecg/modules/costModelCrmWxContract/controller/KzksCrmWxContractController.java
  6. 1 1
      module_kzks/src/main/java/org/jeecg/modules/costModelCrmWxContract/entity/KzksCrmWxContract.java
  7. 13 13
      module_kzks/src/main/java/org/jeecg/modules/costModelProductPrice/controller/KzksCostModelProductPriceController.java
  8. 1 1
      module_kzks/src/main/java/org/jeecg/modules/costModelProductPrice/entity/KzksCostModelProductPrice.java
  9. 13 13
      module_kzks/src/main/java/org/jeecg/modules/dataSourceSwitch/controller/SwitchDataSourceController.java
  10. 1 1
      module_kzks/src/main/java/org/jeecg/modules/dataSourceSwitch/entity/SwitchDataSource.java
  11. 13 13
      module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/controller/KyTaskInfoController.java
  12. 1 1
      module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/entity/KyTaskInfo.java
  13. 0 177
      module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/controller/KzksCostModelClPriceController.java
  14. 0 556
      module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/entity/KzksCostModelClPrice.java
  15. 0 22
      module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/mapper/KzksCostModelClPriceMapper.java
  16. 0 5
      module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/mapper/xml/KzksCostModelClPriceMapper.xml
  17. 0 17
      module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/service/IKzksCostModelClPriceService.java
  18. 0 27
      module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/service/impl/KzksCostModelClPriceServiceImpl.java
  19. 0 387
      module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/vue/KzksCostModelClPriceList.vue
  20. 0 17
      module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/vue/KzksCostModelClPrice_menu_insert.sql
  21. 0 284
      module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/vue/modules/KzksCostModelClPriceForm.vue
  22. 0 84
      module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/vue/modules/KzksCostModelClPriceModal.Style#Drawer.vue
  23. 0 60
      module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/vue/modules/KzksCostModelClPriceModal.vue
  24. 19 19
      module_kzks/src/main/java/org/jeecg/modules/mesInfoInstallationcost/controller/MesInfoInstallationcostController.java
  25. 1 1
      module_kzks/src/main/java/org/jeecg/modules/mesInfoInstallationcost/entity/MesInfoInstallationcost.java

+ 39 - 33
module_kzks/src/main/java/org/jeecg/dataSync/task/MaterialProcurementDataSync.java

@@ -3,8 +3,8 @@ package org.jeecg.dataSync.task;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
 import org.apache.commons.lang3.ObjectUtils;
-import org.jeecg.modules.kzksCostModelClPrice.entity.KzksCostModelClPrice;
-import org.jeecg.modules.kzksCostModelClPrice.service.IKzksCostModelClPriceService;
+import org.jeecg.modules.costModelClPrice.entity.CostModelClPrice;
+import org.jeecg.modules.costModelClPrice.service.ICostModelClPriceService;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -27,7 +27,7 @@ public class MaterialProcurementDataSync implements Job {
     private RestTemplate restTemplate;
 
     @Autowired
-    private IKzksCostModelClPriceService kzksCostModelClPriceService;
+    private ICostModelClPriceService costModelClPriceService;
 
     private static long begin = System.currentTimeMillis();
     private static boolean hasMore = true;
@@ -45,7 +45,7 @@ public class MaterialProcurementDataSync implements Job {
     }
 
     public void initMethod() throws InterruptedException {
-        if (offset == 0) kzksCostModelClPriceService.truncateTable();
+        if (offset == 0) costModelClPriceService.truncateTable();
         try {
             method();
             hasMore = true;
@@ -70,7 +70,7 @@ public class MaterialProcurementDataSync implements Job {
             List<Map<String, Object>> items = JSONObject.parseObject(jsonString, new TypeReference<List<Map<String, Object>>>() {
             });
 
-            ArrayList<KzksCostModelClPrice> list = new ArrayList<>();
+            ArrayList<CostModelClPrice> list = new ArrayList<>();
 
             for (Map<String, Object> item : items) {
                 String uniqueId = (String) item.get("unique_id");  //物料唯一码
@@ -79,60 +79,65 @@ public class MaterialProcurementDataSync implements Job {
                 String wlmc = (String) item.get("wlmc"); //物料名称
                 String ggpp = (String) item.get("ggpp"); //规格型号
                 String qualitygrade = (String) item.get("qualitygrade"); //质量等级
-                String htdate = (String) item.get("ht_date"); //合同签署日期
+                Date htdate = (Date) item.get("ht_date"); //合同签署日期
 
                 Object inputhtye = item.get("htye"); //合同余额
-                BigDecimal htye = null;
+                String htye = null;
                 if (inputhtye instanceof Integer) {
                     Integer casthtye = (Integer) inputhtye;
-                    htye = BigDecimal.valueOf(casthtye);
+                    htye = String.valueOf(casthtye);
                 } else if (inputhtye instanceof BigDecimal) {
-                    htye = (BigDecimal) inputhtye;
+                    BigDecimal inputhtye1 = (BigDecimal) inputhtye;
+                    htye = inputhtye1.toString();
                 }
 
 
-                String fpDate = (String) item.get("fp_date"); //发票开票时间
+                Date fpDate = (Date) item.get("fp_date"); //发票开票时间
                 String jldw = (String) item.get("jldw"); //计量单位
                 String dfhth = (String) item.get("dfhth"); //对方合同号
                 String sl = (String) item.get("sl"); //数量
 
                 Object inputfpje = item.get("fpje"); //发票金额
-                BigDecimal fpje = null;
+                String fpje = null;
                 if (inputfpje instanceof Integer) {
                     Integer castfpje = (Integer) inputfpje;
-                    fpje = BigDecimal.valueOf(castfpje);
+                    fpje = String.valueOf(castfpje);
                 } else if (inputfpje instanceof BigDecimal) {
-                    fpje = (BigDecimal) inputfpje;
+                    BigDecimal inputfpje1 = (BigDecimal) inputfpje;
+                    fpje = inputfpje1.toString();
                 }
 
                 String gys = (String) item.get("gys"); //供应商
 
                 Object inputpzje = item.get("pzje"); //凭证金额
-                BigDecimal pzje = null;
+                String pzje = null;
                 if (inputpzje instanceof Integer) {
                     Integer castpzje = (Integer) inputpzje;
-                    pzje = BigDecimal.valueOf(castpzje);
+                    pzje = String.valueOf(castpzje);
                 } else if (inputpzje instanceof BigDecimal) {
-                    pzje = (BigDecimal) inputpzje;
+                    BigDecimal inputpzje1 = (BigDecimal) inputpzje;
+                    pzje = inputpzje1.toString();
                 }
 
                 Object inputbxdje = item.get("bxd_je"); //报销单金额
-                BigDecimal bxdje = null;
+                String bxdje = null;
                 if (inputbxdje instanceof Integer) {
                     Integer castbxdje = (Integer) inputbxdje;
-                    bxdje = BigDecimal.valueOf(castbxdje);
+                    bxdje = String.valueOf(castbxdje);
                 } else if (inputbxdje instanceof BigDecimal) {
-                    bxdje = (BigDecimal) inputbxdje;
+                    BigDecimal inputbxdje1 = (BigDecimal) inputbxdje;
+                    bxdje = inputbxdje1.toString();
                 }
 
 
                 Object inputhtje = item.get("ht_je"); //合同金额
-                BigDecimal htje = null;
+                String htje = null;
                 if (inputhtje instanceof Integer) {
                     Integer casthtje = (Integer) inputhtje;
-                    htje = BigDecimal.valueOf(casthtje);
+                    htje = String.valueOf(casthtje);
                 } else if (inputhtje instanceof BigDecimal) {
-                    htje = (BigDecimal) inputhtje;
+                    BigDecimal inputhtje1 = (BigDecimal) inputhtje;
+                    htje = inputhtje1.toString();
                 }
 
 
@@ -146,27 +151,28 @@ public class MaterialProcurementDataSync implements Job {
                 String fylb = (String) item.get("fylb"); //费用类别
                 String pzbh = (String) item.get("pzbh"); //凭证编号
                 String yhhdbh = (String) item.get("yhhd_bh"); //银行流水号
-                Integer fjht = (Integer) item.get("fj_ht"); //合同附件
-                Integer fjpz = (Integer) item.get("fj_pz"); //凭证附件
-                Integer fjbxd = (Integer) item.get("fj_bxd"); //报销单附件
-                Integer fjyhhd = (Integer) item.get("fj_yhhd"); //回单附件
-                Integer fjrkd = (Integer) item.get("fj_rkd"); //入库单附件
+                String fjht = (String) item.get("fj_ht"); //合同附件
+                String fjpz = (String) item.get("fj_pz"); //凭证附件
+                String fjbxd = (String) item.get("fj_bxd"); //报销单附件
+                String fjyhhd = (String) item.get("fj_yhhd"); //回单附件
+                String fjrkd = (String) item.get("fj_rkd"); //入库单附件
                 String fjfp = (String) item.get("fj_fp"); //发票附件
 
                 Object intputdj = item.get("dj"); //单价
-                BigDecimal dj;
+                String dj;
                 if (intputdj instanceof Integer) {
                     Integer castdj = (Integer) intputdj;
-                    dj = BigDecimal.valueOf(castdj);
+                    dj = String.valueOf(castdj);
                 } else {
-                    dj = (BigDecimal) intputdj;
+                    BigDecimal intputdj1 = (BigDecimal) intputdj;
+                    dj = intputdj1.toString();
                 }
 
 
                 String wzpch = (String) item.get("wz_pch"); //批次号
                 String wzgyspch = (String) item.get("wz_gys_pch"); //供应商批次号
 
-                KzksCostModelClPrice price = new KzksCostModelClPrice();
+                CostModelClPrice  price = new CostModelClPrice();
                 price.setId(null);
                 if (ObjectUtils.isNotEmpty(uniqueId)) price.setUniqueId(uniqueId);
                 if (ObjectUtils.isNotEmpty(wlbh)) price.setWlbm(wlbh);
@@ -188,7 +194,7 @@ public class MaterialProcurementDataSync implements Job {
                 if (ObjectUtils.isNotEmpty(totalje)) price.setTotalJe(totalje);
                 if (ObjectUtils.isNotEmpty(billno)) price.setBillno(billno);
                 if (ObjectUtils.isNotEmpty(hth)) price.setHth(hth);
-                if (ObjectUtils.isNotEmpty(tyear)) price.settYear(tyear);
+                if (ObjectUtils.isNotEmpty(tyear)) price.setTYear(tyear);
                 if (ObjectUtils.isNotEmpty(fph)) price.setFph(fph);
                 if (ObjectUtils.isNotEmpty(bxdbh)) price.setBxdBh(bxdbh);
                 if (ObjectUtils.isNotEmpty(pzrq)) price.setPzrq(pzrq);
@@ -210,7 +216,7 @@ public class MaterialProcurementDataSync implements Job {
                 list.add(price);
 
             }
-            kzksCostModelClPriceService.saveBatch(list);
+            costModelClPriceService.saveBatch(list);
             offset += length;
             hasMore = JSONObject.parseObject(JSONObject.toJSONString(stringObjectMap.get("hasMore")), Boolean.class);
         }

+ 4 - 0
module_kzks/src/main/java/org/jeecg/modules/costModelClPrice/mapper/CostModelClPriceMapper.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.costModelClPrice.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.costModelClPrice.entity.CostModelClPrice;
@@ -28,4 +29,7 @@ public interface CostModelClPriceMapper extends BaseMapper<CostModelClPrice> {
 //    public List<CostModelClPrice> getCLPDetailList(@Param("wlbm") String wlbm, @Param("ggxh") String ggxh, @Param("zlLevel") String zlLevel, @Param("pici") String pici);
     public List<CostModelClPrice> getCLPDetailList(CostModelXmxqCl cl);
 
+    @Delete("truncate table kzks_cost_model_cl_price")
+    void truncateTable();
+
 }

+ 1 - 0
module_kzks/src/main/java/org/jeecg/modules/costModelClPrice/service/ICostModelClPriceService.java

@@ -27,5 +27,6 @@ public interface ICostModelClPriceService extends IService<CostModelClPrice> {
    public List<CostModelClPrice> getCLPDetailList(CostModelXmxqCl cl);
 
 
+    void truncateTable();
 
 }

+ 5 - 0
module_kzks/src/main/java/org/jeecg/modules/costModelClPrice/service/impl/CostModelClPriceServiceImpl.java

@@ -44,4 +44,9 @@ public class CostModelClPriceServiceImpl extends ServiceImpl<CostModelClPriceMap
         return clPriceMapper.getCLPDetailList(cl);
     }
 
+    @Override
+    public void truncateTable() {
+        clPriceMapper.truncateTable();
+    }
+
 }

+ 13 - 13
module_kzks/src/main/java/org/jeecg/modules/costModelCrmWxContract/controller/KzksCrmWxContractController.java

@@ -27,7 +27,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  * @Date:   2023-11-07
  * @Version: V1.0
  */
-@Api(tags="kzks_crm_wx_contract")
+@Api(tags="crm外协合同")
 @RestController
 @RequestMapping("/CostModelCrmWxContract/kzksCrmWxContract")
 @Slf4j
@@ -44,8 +44,8 @@ public class KzksCrmWxContractController extends JeecgController<KzksCrmWxContra
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "kzks_crm_wx_contract-分页列表查询")
-	@ApiOperation(value="kzks_crm_wx_contract-分页列表查询", notes="kzks_crm_wx_contract-分页列表查询")
+	//@AutoLog(value = "crm外协合同-分页列表查询")
+	@ApiOperation(value="crm外协合同-分页列表查询", notes="crm外协合同-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<KzksCrmWxContract>> queryPageList(KzksCrmWxContract kzksCrmWxContract,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -63,8 +63,8 @@ public class KzksCrmWxContractController extends JeecgController<KzksCrmWxContra
 	 * @param kzksCrmWxContract
 	 * @return
 	 */
-	@AutoLog(value = "kzks_crm_wx_contract-添加")
-	@ApiOperation(value="kzks_crm_wx_contract-添加", notes="kzks_crm_wx_contract-添加")
+	@AutoLog(value = "crm外协合同-添加")
+	@ApiOperation(value="crm外协合同-添加", notes="crm外协合同-添加")
 	//@RequiresPermissions("org.jeecg.modules:kzks_crm_wx_contract:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody KzksCrmWxContract kzksCrmWxContract) {
@@ -78,8 +78,8 @@ public class KzksCrmWxContractController extends JeecgController<KzksCrmWxContra
 	 * @param kzksCrmWxContract
 	 * @return
 	 */
-	@AutoLog(value = "kzks_crm_wx_contract-编辑")
-	@ApiOperation(value="kzks_crm_wx_contract-编辑", notes="kzks_crm_wx_contract-编辑")
+	@AutoLog(value = "crm外协合同-编辑")
+	@ApiOperation(value="crm外协合同-编辑", notes="crm外协合同-编辑")
 	//@RequiresPermissions("org.jeecg.modules:kzks_crm_wx_contract:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody KzksCrmWxContract kzksCrmWxContract) {
@@ -93,8 +93,8 @@ public class KzksCrmWxContractController extends JeecgController<KzksCrmWxContra
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "kzks_crm_wx_contract-通过id删除")
-	@ApiOperation(value="kzks_crm_wx_contract-通过id删除", notes="kzks_crm_wx_contract-通过id删除")
+	@AutoLog(value = "crm外协合同-通过id删除")
+	@ApiOperation(value="crm外协合同-通过id删除", notes="crm外协合同-通过id删除")
 	//@RequiresPermissions("org.jeecg.modules:kzks_crm_wx_contract:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -108,8 +108,8 @@ public class KzksCrmWxContractController extends JeecgController<KzksCrmWxContra
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "kzks_crm_wx_contract-批量删除")
-	@ApiOperation(value="kzks_crm_wx_contract-批量删除", notes="kzks_crm_wx_contract-批量删除")
+	@AutoLog(value = "crm外协合同-批量删除")
+	@ApiOperation(value="crm外协合同-批量删除", notes="crm外协合同-批量删除")
 	//@RequiresPermissions("org.jeecg.modules:kzks_crm_wx_contract:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -123,8 +123,8 @@ public class KzksCrmWxContractController extends JeecgController<KzksCrmWxContra
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "kzks_crm_wx_contract-通过id查询")
-	@ApiOperation(value="kzks_crm_wx_contract-通过id查询", notes="kzks_crm_wx_contract-通过id查询")
+	//@AutoLog(value = "crm外协合同-通过id查询")
+	@ApiOperation(value="crm外协合同-通过id查询", notes="crm外协合同-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<KzksCrmWxContract> queryById(@RequestParam(name="id",required=true) String id) {
 		KzksCrmWxContract kzksCrmWxContract = kzksCrmWxContractService.getById(id);

+ 1 - 1
module_kzks/src/main/java/org/jeecg/modules/costModelCrmWxContract/entity/KzksCrmWxContract.java

@@ -24,7 +24,7 @@ import lombok.experimental.Accessors;
 @TableName("kzks_crm_wx_contract")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="kzks_crm_wx_contract对象", description="kzks_crm_wx_contract")
+@ApiModel(value="crm外协合同对象", description="crm外协合同")
 public class KzksCrmWxContract implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 13 - 13
module_kzks/src/main/java/org/jeecg/modules/costModelProductPrice/controller/KzksCostModelProductPriceController.java

@@ -44,7 +44,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  * @Date:   2023-10-24
  * @Version: V1.0
  */
-@Api(tags="kzks_cost_model_product_price")
+@Api(tags="产品价格库")
 @RestController
 @RequestMapping("/costModelProductPrice/costModelProductPrice")
 @Slf4j
@@ -63,8 +63,8 @@ public class KzksCostModelProductPriceController extends JeecgController<KzksCos
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "kzks_cost_model_product_price-分页列表查询")
-	@ApiOperation(value="kzks_cost_model_product_price-分页列表查询", notes="kzks_cost_model_product_price-分页列表查询")
+	//@AutoLog(value = "产品价格库-分页列表查询")
+	@ApiOperation(value="产品价格库-分页列表查询", notes="产品价格库-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<KzksCostModelProductPrice>> queryPageList(KzksCostModelProductPrice kzksCostModelProductPrice,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -84,8 +84,8 @@ public class KzksCostModelProductPriceController extends JeecgController<KzksCos
 	 * @param kzksCostModelProductPrice
 	 * @return
 	 */
-	@AutoLog(value = "kzks_cost_model_product_price-添加")
-	@ApiOperation(value="kzks_cost_model_product_price-添加", notes="kzks_cost_model_product_price-添加")
+	@AutoLog(value = "产品价格库-添加")
+	@ApiOperation(value="产品价格库-添加", notes="产品价格库-添加")
 	//@RequiresPermissions("org.jeecg.modules:kzks_cost_model_product_price:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody KzksCostModelProductPrice kzksCostModelProductPrice) {
@@ -99,8 +99,8 @@ public class KzksCostModelProductPriceController extends JeecgController<KzksCos
 	 * @param kzksCostModelProductPrice
 	 * @return
 	 */
-	@AutoLog(value = "kzks_cost_model_product_price-编辑")
-	@ApiOperation(value="kzks_cost_model_product_price-编辑", notes="kzks_cost_model_product_price-编辑")
+	@AutoLog(value = "产品价格库-编辑")
+	@ApiOperation(value="产品价格库-编辑", notes="产品价格库-编辑")
 	//@RequiresPermissions("org.jeecg.modules:kzks_cost_model_product_price:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody KzksCostModelProductPrice kzksCostModelProductPrice) {
@@ -114,8 +114,8 @@ public class KzksCostModelProductPriceController extends JeecgController<KzksCos
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "kzks_cost_model_product_price-通过id删除")
-	@ApiOperation(value="kzks_cost_model_product_price-通过id删除", notes="kzks_cost_model_product_price-通过id删除")
+	@AutoLog(value = "产品价格库-通过id删除")
+	@ApiOperation(value="产品价格库-通过id删除", notes="产品价格库-通过id删除")
 	//@RequiresPermissions("org.jeecg.modules:kzks_cost_model_product_price:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -132,8 +132,8 @@ public class KzksCostModelProductPriceController extends JeecgController<KzksCos
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "kzks_cost_model_product_price-批量删除")
-	@ApiOperation(value="kzks_cost_model_product_price-批量删除", notes="kzks_cost_model_product_price-批量删除")
+	@AutoLog(value = "产品价格库-批量删除")
+	@ApiOperation(value="产品价格库-批量删除", notes="产品价格库-批量删除")
 	//@RequiresPermissions("org.jeecg.modules:kzks_cost_model_product_price:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -150,8 +150,8 @@ public class KzksCostModelProductPriceController extends JeecgController<KzksCos
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "kzks_cost_model_product_price-通过id查询")
-	@ApiOperation(value="kzks_cost_model_product_price-通过id查询", notes="kzks_cost_model_product_price-通过id查询")
+	//@AutoLog(value = "产品价格库-通过id查询")
+	@ApiOperation(value="产品价格库-通过id查询", notes="产品价格库-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<KzksCostModelProductPrice> queryById(@RequestParam(name="id",required=true) String id) {
 		KzksCostModelProductPrice kzksCostModelProductPrice = kzksCostModelProductPriceService.getById(id);

+ 1 - 1
module_kzks/src/main/java/org/jeecg/modules/costModelProductPrice/entity/KzksCostModelProductPrice.java

@@ -28,7 +28,7 @@ import lombok.experimental.Accessors;
 @TableName("kzks_cost_model_product_price")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="kzks_cost_model_product_price对象", description="kzks_cost_model_product_price")
+@ApiModel(value="产品价格库对象", description="产品价格库")
 public class KzksCostModelProductPrice implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 13 - 13
module_kzks/src/main/java/org/jeecg/modules/dataSourceSwitch/controller/SwitchDataSourceController.java

@@ -27,7 +27,7 @@ import java.util.Arrays;
  * @Date:   2023-08-27
  * @Version: V1.0
  */
-@Api(tags="switch_data_source")
+@Api(tags="切换数据源")
 @RestController
 @RequestMapping("/dataSourceSwitch/switchDataSource")
 @Slf4j
@@ -60,8 +60,8 @@ public class SwitchDataSourceController extends JeecgController<SwitchDataSource
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "switch_data_source-分页列表查询")
-	@ApiOperation(value="switch_data_source-分页列表查询", notes="switch_data_source-分页列表查询")
+	//@AutoLog(value = "切换数据源-分页列表查询")
+	@ApiOperation(value="切换数据源-分页列表查询", notes="切换数据源-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<SwitchDataSource>> queryPageList(SwitchDataSource switchDataSource,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -79,8 +79,8 @@ public class SwitchDataSourceController extends JeecgController<SwitchDataSource
 	 * @param switchDataSource
 	 * @return
 	 */
-	@AutoLog(value = "switch_data_source-添加")
-	@ApiOperation(value="switch_data_source-添加", notes="switch_data_source-添加")
+	@AutoLog(value = "切换数据源-添加")
+	@ApiOperation(value="切换数据源-添加", notes="切换数据源-添加")
 	//@RequiresPermissions("org.jeecg.modules:switch_data_source:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody SwitchDataSource switchDataSource) {
@@ -94,8 +94,8 @@ public class SwitchDataSourceController extends JeecgController<SwitchDataSource
 	 * @param switchDataSource
 	 * @return
 	 */
-	@AutoLog(value = "switch_data_source-编辑")
-	@ApiOperation(value="switch_data_source-编辑", notes="switch_data_source-编辑")
+	@AutoLog(value = "切换数据源-编辑")
+	@ApiOperation(value="切换数据源-编辑", notes="切换数据源-编辑")
 	//@RequiresPermissions("org.jeecg.modules:switch_data_source:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody SwitchDataSource switchDataSource) {
@@ -109,8 +109,8 @@ public class SwitchDataSourceController extends JeecgController<SwitchDataSource
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "switch_data_source-通过id删除")
-	@ApiOperation(value="switch_data_source-通过id删除", notes="switch_data_source-通过id删除")
+	@AutoLog(value = "切换数据源-通过id删除")
+	@ApiOperation(value="切换数据源-通过id删除", notes="切换数据源-通过id删除")
 	//@RequiresPermissions("org.jeecg.modules:switch_data_source:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -124,8 +124,8 @@ public class SwitchDataSourceController extends JeecgController<SwitchDataSource
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "switch_data_source-批量删除")
-	@ApiOperation(value="switch_data_source-批量删除", notes="switch_data_source-批量删除")
+	@AutoLog(value = "切换数据源-批量删除")
+	@ApiOperation(value="切换数据源-批量删除", notes="切换数据源-批量删除")
 	//@RequiresPermissions("org.jeecg.modules:switch_data_source:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -139,8 +139,8 @@ public class SwitchDataSourceController extends JeecgController<SwitchDataSource
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "switch_data_source-通过id查询")
-	@ApiOperation(value="switch_data_source-通过id查询", notes="switch_data_source-通过id查询")
+	//@AutoLog(value = "切换数据源-通过id查询")
+	@ApiOperation(value="切换数据源-通过id查询", notes="切换数据源-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<SwitchDataSource> queryById(@RequestParam(name="id",required=true) String id) {
 		SwitchDataSource switchDataSource = switchDataSourceService.getById(id);

+ 1 - 1
module_kzks/src/main/java/org/jeecg/modules/dataSourceSwitch/entity/SwitchDataSource.java

@@ -28,7 +28,7 @@ import lombok.experimental.Accessors;
 @TableName("switch_data_source")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="switch_data_source对象", description="switch_data_source")
+@ApiModel(value="切换数据源对象", description="切换数据源")
 public class SwitchDataSource implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 13 - 13
module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/controller/KyTaskInfoController.java

@@ -26,7 +26,7 @@ import java.util.Arrays;
  * @Date:   2023-08-30
  * @Version: V1.0
  */
-@Api(tags="ky_task_info")
+@Api(tags="科研任务")
 @RestController
 @RequestMapping("/kyTaskInfo/kyTaskInfo")
 @Slf4j
@@ -43,8 +43,8 @@ public class KyTaskInfoController extends JeecgController<KyTaskInfo, IKyTaskInf
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "ky_task_info-分页列表查询")
-	@ApiOperation(value="ky_task_info-分页列表查询", notes="ky_task_info-分页列表查询")
+	//@AutoLog(value = "科研任务-分页列表查询")
+	@ApiOperation(value="科研任务-分页列表查询", notes="科研任务-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<KyTaskInfo>> queryPageList(KyTaskInfo kyTaskInfo,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -62,8 +62,8 @@ public class KyTaskInfoController extends JeecgController<KyTaskInfo, IKyTaskInf
 	 * @param kyTaskInfo
 	 * @return
 	 */
-	@AutoLog(value = "ky_task_info-添加")
-	@ApiOperation(value="ky_task_info-添加", notes="ky_task_info-添加")
+	@AutoLog(value = "科研任务-添加")
+	@ApiOperation(value="科研任务-添加", notes="科研任务-添加")
 	//@RequiresPermissions("org.jeecg.modules:ky_task_info:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody KyTaskInfo kyTaskInfo) {
@@ -77,8 +77,8 @@ public class KyTaskInfoController extends JeecgController<KyTaskInfo, IKyTaskInf
 	 * @param kyTaskInfo
 	 * @return
 	 */
-	@AutoLog(value = "ky_task_info-编辑")
-	@ApiOperation(value="ky_task_info-编辑", notes="ky_task_info-编辑")
+	@AutoLog(value = "科研任务-编辑")
+	@ApiOperation(value="科研任务-编辑", notes="科研任务-编辑")
 	//@RequiresPermissions("org.jeecg.modules:ky_task_info:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody KyTaskInfo kyTaskInfo) {
@@ -92,8 +92,8 @@ public class KyTaskInfoController extends JeecgController<KyTaskInfo, IKyTaskInf
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "ky_task_info-通过id删除")
-	@ApiOperation(value="ky_task_info-通过id删除", notes="ky_task_info-通过id删除")
+	@AutoLog(value = "科研任务-通过id删除")
+	@ApiOperation(value="科研任务-通过id删除", notes="科研任务-通过id删除")
 	//@RequiresPermissions("org.jeecg.modules:ky_task_info:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -107,8 +107,8 @@ public class KyTaskInfoController extends JeecgController<KyTaskInfo, IKyTaskInf
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "ky_task_info-批量删除")
-	@ApiOperation(value="ky_task_info-批量删除", notes="ky_task_info-批量删除")
+	@AutoLog(value = "科研任务-批量删除")
+	@ApiOperation(value="科研任务-批量删除", notes="科研任务-批量删除")
 	//@RequiresPermissions("org.jeecg.modules:ky_task_info:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -122,8 +122,8 @@ public class KyTaskInfoController extends JeecgController<KyTaskInfo, IKyTaskInf
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "ky_task_info-通过id查询")
-	@ApiOperation(value="ky_task_info-通过id查询", notes="ky_task_info-通过id查询")
+	//@AutoLog(value = "科研任务-通过id查询")
+	@ApiOperation(value="科研任务-通过id查询", notes="科研任务-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<KyTaskInfo> queryById(@RequestParam(name="id",required=true) String id) {
 		KyTaskInfo kyTaskInfo = kyTaskInfoService.getById(id);

+ 1 - 1
module_kzks/src/main/java/org/jeecg/modules/kyTaskInfo/entity/KyTaskInfo.java

@@ -28,7 +28,7 @@ import lombok.experimental.Accessors;
 @TableName("ky_task_info")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="ky_task_info对象", description="ky_task_info")
+@ApiModel(value="科研任务对象", description="科研任务")
 public class KyTaskInfo implements Serializable {
     private static final long serialVersionUID = 1L;
 

+ 0 - 177
module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/controller/KzksCostModelClPriceController.java

@@ -1,177 +0,0 @@
-package org.jeecg.modules.kzksCostModelClPrice.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecg.modules.kzksCostModelClPrice.entity.KzksCostModelClPrice;
-import org.jeecg.modules.kzksCostModelClPrice.service.IKzksCostModelClPriceService;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-
- /**
- * @Description: kzks_cost_model_cl_price
- * @Author: jeecg-boot
- * @Date:   2023-09-18
- * @Version: V1.0
- */
-@Api(tags="kzks_cost_model_cl_price")
-@RestController
-@RequestMapping("/KzksCostModelClPrice/kzksCostModelClPrice")
-@Slf4j
-public class KzksCostModelClPriceController extends JeecgController<KzksCostModelClPrice, IKzksCostModelClPriceService> {
-	@Autowired
-	private IKzksCostModelClPriceService kzksCostModelClPriceService;
-
-	/**
-	 * 分页列表查询
-	 *
-	 * @param kzksCostModelClPrice
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "kzks_cost_model_cl_price-分页列表查询")
-	@ApiOperation(value="kzks_cost_model_cl_price-分页列表查询", notes="kzks_cost_model_cl_price-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<KzksCostModelClPrice>> queryPageList(KzksCostModelClPrice kzksCostModelClPrice,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<KzksCostModelClPrice> queryWrapper = QueryGenerator.initQueryWrapper(kzksCostModelClPrice, req.getParameterMap());
-		Page<KzksCostModelClPrice> page = new Page<KzksCostModelClPrice>(pageNo, pageSize);
-		IPage<KzksCostModelClPrice> pageList = kzksCostModelClPriceService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-
-	/**
-	 *   添加
-	 *
-	 * @param kzksCostModelClPrice
-	 * @return
-	 */
-	@AutoLog(value = "kzks_cost_model_cl_price-添加")
-	@ApiOperation(value="kzks_cost_model_cl_price-添加", notes="kzks_cost_model_cl_price-添加")
-	//@RequiresPermissions("org.jeecg.modules:kzks_cost_model_cl_price:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody KzksCostModelClPrice kzksCostModelClPrice) {
-		kzksCostModelClPriceService.save(kzksCostModelClPrice);
-		return Result.OK("添加成功!");
-	}
-
-	/**
-	 *  编辑
-	 *
-	 * @param kzksCostModelClPrice
-	 * @return
-	 */
-	@AutoLog(value = "kzks_cost_model_cl_price-编辑")
-	@ApiOperation(value="kzks_cost_model_cl_price-编辑", notes="kzks_cost_model_cl_price-编辑")
-	//@RequiresPermissions("org.jeecg.modules:kzks_cost_model_cl_price:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody KzksCostModelClPrice kzksCostModelClPrice) {
-		kzksCostModelClPriceService.updateById(kzksCostModelClPrice);
-		return Result.OK("编辑成功!");
-	}
-
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "kzks_cost_model_cl_price-通过id删除")
-	@ApiOperation(value="kzks_cost_model_cl_price-通过id删除", notes="kzks_cost_model_cl_price-通过id删除")
-	//@RequiresPermissions("org.jeecg.modules:kzks_cost_model_cl_price:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		kzksCostModelClPriceService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "kzks_cost_model_cl_price-批量删除")
-	@ApiOperation(value="kzks_cost_model_cl_price-批量删除", notes="kzks_cost_model_cl_price-批量删除")
-	//@RequiresPermissions("org.jeecg.modules:kzks_cost_model_cl_price:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.kzksCostModelClPriceService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "kzks_cost_model_cl_price-通过id查询")
-	@ApiOperation(value="kzks_cost_model_cl_price-通过id查询", notes="kzks_cost_model_cl_price-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<KzksCostModelClPrice> queryById(@RequestParam(name="id",required=true) String id) {
-		KzksCostModelClPrice kzksCostModelClPrice = kzksCostModelClPriceService.getById(id);
-		if(kzksCostModelClPrice==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(kzksCostModelClPrice);
-	}
-
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param kzksCostModelClPrice
-    */
-    //@RequiresPermissions("org.jeecg.modules:kzks_cost_model_cl_price:exportXls")
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, KzksCostModelClPrice kzksCostModelClPrice) {
-        return super.exportXls(request, kzksCostModelClPrice, KzksCostModelClPrice.class, "kzks_cost_model_cl_price");
-    }
-
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    //@RequiresPermissions("kzks_cost_model_cl_price:importExcel")
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, KzksCostModelClPrice.class);
-    }
-
-}

+ 0 - 556
module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/entity/KzksCostModelClPrice.java

@@ -1,556 +0,0 @@
-package org.jeecg.modules.kzksCostModelClPrice.entity;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * @Description: kzks_cost_model_cl_price
- * @Author: jeecg-boot
- * @Date:   2023-09-18
- * @Version: V1.0
- */
-@Data
-@TableName("kzks_cost_model_cl_price")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="kzks_cost_model_cl_price对象", description="kzks_cost_model_cl_price")
-public class KzksCostModelClPrice implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-	/**id*/
-	@TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private java.lang.Integer id;
-	/**物料编码*/
-	@Excel(name = "物料编码", width = 15)
-    @ApiModelProperty(value = "物料编码")
-    private java.lang.String wlbm;
-	/**规格型号*/
-	@Excel(name = "规格型号", width = 15)
-    @ApiModelProperty(value = "规格型号")
-    private java.lang.String ggxh;
-	/**质量等级*/
-	@Excel(name = "质量等级", width = 15)
-    @ApiModelProperty(value = "质量等级")
-    private java.lang.String zlLevel;
-	/**单价*/
-	@Excel(name = "单价", width = 15)
-    @ApiModelProperty(value = "单价")
-    private BigDecimal danjia;
-	/**批次号*/
-	@Excel(name = "批次号", width = 15)
-    @ApiModelProperty(value = "批次号")
-    private java.lang.String pici;
-	/**供应商批次号*/
-	@Excel(name = "供应商批次号", width = 15)
-    @ApiModelProperty(value = "供应商批次号")
-    private java.lang.String wzGysPch;
-	/**合同签署日期*/
-	@Excel(name = "合同签署日期", width = 15)
-    @ApiModelProperty(value = "合同签署日期")
-    private java.lang.String htDate;
-	/**合同余额*/
-	@Excel(name = "合同余额", width = 15)
-    @ApiModelProperty(value = "合同余额")
-    private BigDecimal htye;
-	/**发票开票时间*/
-	@Excel(name = "发票开票时间", width = 15)
-    @ApiModelProperty(value = "发票开票时间")
-    private java.lang.String fpDate;
-	/**计量单位*/
-	@Excel(name = "计量单位", width = 15)
-    @ApiModelProperty(value = "计量单位")
-    private java.lang.String jldw;
-	/**对方合同号*/
-	@Excel(name = "对方合同号", width = 15)
-    @ApiModelProperty(value = "对方合同号")
-    private java.lang.String dfhth;
-	/**数量*/
-	@Excel(name = "数量", width = 15)
-    @ApiModelProperty(value = "数量")
-    private java.lang.String sl;
-	/**发票金额*/
-	@Excel(name = "发票金额", width = 15)
-    @ApiModelProperty(value = "发票金额")
-    private BigDecimal fpje;
-	/**供应商*/
-	@Excel(name = "供应商", width = 15)
-    @ApiModelProperty(value = "供应商")
-    private java.lang.String gys;
-	/**凭证金额*/
-	@Excel(name = "凭证金额", width = 15)
-    @ApiModelProperty(value = "凭证金额")
-    private java.math.BigDecimal pzje;
-	/**报销单金额*/
-	@Excel(name = "报销单金额", width = 15)
-    @ApiModelProperty(value = "报销单金额")
-    private BigDecimal bxdJe;
-	/**合同金额*/
-	@Excel(name = "合同金额", width = 15)
-    @ApiModelProperty(value = "合同金额")
-    private BigDecimal htJe;
-	/**入库单金额*/
-	@Excel(name = "入库单金额", width = 15)
-    @ApiModelProperty(value = "入库单金额")
-    private java.lang.String totalJe;
-	/**入库单号*/
-	@Excel(name = "入库单号", width = 15)
-    @ApiModelProperty(value = "入库单号")
-    private java.lang.String billno;
-	/**合同号*/
-	@Excel(name = "合同号", width = 15)
-    @ApiModelProperty(value = "合同号")
-    private java.lang.String hth;
-	/**合同年份*/
-	@Excel(name = "合同年份", width = 15)
-    @ApiModelProperty(value = "合同年份")
-    private java.lang.String tYear;
-	/**发票号*/
-	@Excel(name = "发票号", width = 15)
-    @ApiModelProperty(value = "发票号")
-    private java.lang.String fph;
-	/**报销单号*/
-	@Excel(name = "报销单号", width = 15)
-    @ApiModelProperty(value = "报销单号")
-    private java.lang.String bxdBh;
-	/**凭证日期*/
-	@Excel(name = "凭证日期", width = 15)
-    @ApiModelProperty(value = "凭证日期")
-    private java.lang.String pzrq;
-	/**费用类别*/
-	@Excel(name = "费用类别", width = 15)
-    @ApiModelProperty(value = "费用类别")
-    private java.lang.String fylb;
-	/**凭证编号*/
-	@Excel(name = "凭证编号", width = 15)
-    @ApiModelProperty(value = "凭证编号")
-    private java.lang.String pzbh;
-	/**银行流水号*/
-	@Excel(name = "银行流水号", width = 15)
-    @ApiModelProperty(value = "银行流水号")
-    private java.lang.String yhhdBh;
-	/**合同附件*/
-	@Excel(name = "合同附件", width = 15)
-    @ApiModelProperty(value = "合同附件")
-    private java.lang.Integer fjHt;
-	/**凭证附件*/
-	@Excel(name = "凭证附件", width = 15)
-    @ApiModelProperty(value = "凭证附件")
-    private java.lang.Integer fjPz;
-	/**报销单附件*/
-	@Excel(name = "报销单附件", width = 15)
-    @ApiModelProperty(value = "报销单附件")
-    private java.lang.Integer fjBxd;
-	/**回单附件*/
-	@Excel(name = "回单附件", width = 15)
-    @ApiModelProperty(value = "回单附件")
-    private java.lang.Integer fjYhhd;
-	/**入库单附件*/
-	@Excel(name = "入库单附件", width = 15)
-    @ApiModelProperty(value = "入库单附件")
-    private java.lang.Integer fjRkd;
-	/**发票附件*/
-	@Excel(name = "发票附件", width = 15)
-    @ApiModelProperty(value = "发票附件")
-    private java.lang.String fjFp;
-	/**物料名称*/
-	@Excel(name = "物料名称", width = 15)
-    @ApiModelProperty(value = "物料名称")
-    private java.lang.String wlmc;
-	/**凭证唯一码*/
-	@Excel(name = "凭证唯一码", width = 15)
-    @ApiModelProperty(value = "凭证唯一码")
-    private java.lang.String pzCode;
-	/**物料唯一码*/
-	@Excel(name = "物料唯一码", width = 15)
-    @ApiModelProperty(value = "物料唯一码")
-    private java.lang.String uniqueId;
-	/**创建人*/
-    @ApiModelProperty(value = "创建人")
-    private java.lang.String createBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "创建日期")
-    private java.util.Date createTime;
-	/**更新人*/
-    @ApiModelProperty(value = "更新人")
-    private java.lang.String updateBy;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "更新日期")
-    private java.util.Date updateTime;
-	/**所属部门*/
-    @ApiModelProperty(value = "所属部门")
-    private java.lang.String sysOrgCode;
-	/**采购日期*/
-	@Excel(name = "采购日期", width = 15)
-    @ApiModelProperty(value = "采购日期")
-    private java.lang.String caigouTime;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getWlbm() {
-        return wlbm;
-    }
-
-    public void setWlbm(String wlbm) {
-        this.wlbm = wlbm;
-    }
-
-    public String getGgxh() {
-        return ggxh;
-    }
-
-    public void setGgxh(String ggxh) {
-        this.ggxh = ggxh;
-    }
-
-    public String getZlLevel() {
-        return zlLevel;
-    }
-
-    public void setZlLevel(String zlLevel) {
-        this.zlLevel = zlLevel;
-    }
-
-    public BigDecimal getDanjia() {
-        return danjia;
-    }
-
-    public void setDanjia(BigDecimal danjia) {
-        this.danjia = danjia;
-    }
-
-    public String getPici() {
-        return pici;
-    }
-
-    public void setPici(String pici) {
-        this.pici = pici;
-    }
-
-    public String getWzGysPch() {
-        return wzGysPch;
-    }
-
-    public void setWzGysPch(String wzGysPch) {
-        this.wzGysPch = wzGysPch;
-    }
-
-    public String getHtDate() {
-        return htDate;
-    }
-
-    public void setHtDate(String htDate) {
-        this.htDate = htDate;
-    }
-
-
-    public String getFpDate() {
-        return fpDate;
-    }
-
-    public void setFpDate(String fpDate) {
-        this.fpDate = fpDate;
-    }
-
-    public String getJldw() {
-        return jldw;
-    }
-
-    public void setJldw(String jldw) {
-        this.jldw = jldw;
-    }
-
-    public String getDfhth() {
-        return dfhth;
-    }
-
-    public void setDfhth(String dfhth) {
-        this.dfhth = dfhth;
-    }
-
-    public String getSl() {
-        return sl;
-    }
-
-    public void setSl(String sl) {
-        this.sl = sl;
-    }
-
-
-    public String getGys() {
-        return gys;
-    }
-
-    public void setGys(String gys) {
-        this.gys = gys;
-    }
-
-    public BigDecimal getPzje() {
-        return pzje;
-    }
-
-    public void setPzje(BigDecimal pzje) {
-        this.pzje = pzje;
-    }
-
-    public BigDecimal getBxdJe() {
-        return bxdJe;
-    }
-
-    public void setBxdJe(BigDecimal bxdJe) {
-        this.bxdJe = bxdJe;
-    }
-
-    public String getTotalJe() {
-        return totalJe;
-    }
-
-    public void setTotalJe(String totalJe) {
-        this.totalJe = totalJe;
-    }
-
-    public String getBillno() {
-        return billno;
-    }
-
-    public void setBillno(String billno) {
-        this.billno = billno;
-    }
-
-    public String getHth() {
-        return hth;
-    }
-
-    public void setHth(String hth) {
-        this.hth = hth;
-    }
-
-    public String gettYear() {
-        return tYear;
-    }
-
-    public void settYear(String tYear) {
-        this.tYear = tYear;
-    }
-
-    public String getFph() {
-        return fph;
-    }
-
-    public void setFph(String fph) {
-        this.fph = fph;
-    }
-
-    public String getBxdBh() {
-        return bxdBh;
-    }
-
-    public void setBxdBh(String bxdBh) {
-        this.bxdBh = bxdBh;
-    }
-
-    public String getPzrq() {
-        return pzrq;
-    }
-
-    public void setPzrq(String pzrq) {
-        this.pzrq = pzrq;
-    }
-
-    public String getFylb() {
-        return fylb;
-    }
-
-    public void setFylb(String fylb) {
-        this.fylb = fylb;
-    }
-
-    public String getPzbh() {
-        return pzbh;
-    }
-
-    public void setPzbh(String pzbh) {
-        this.pzbh = pzbh;
-    }
-
-    public String getYhhdBh() {
-        return yhhdBh;
-    }
-
-    public void setYhhdBh(String yhhdBh) {
-        this.yhhdBh = yhhdBh;
-    }
-
-    public Integer getFjHt() {
-        return fjHt;
-    }
-
-    public void setFjHt(Integer fjHt) {
-        this.fjHt = fjHt;
-    }
-
-    public Integer getFjPz() {
-        return fjPz;
-    }
-
-    public void setFjPz(Integer fjPz) {
-        this.fjPz = fjPz;
-    }
-
-    public Integer getFjBxd() {
-        return fjBxd;
-    }
-
-    public void setFjBxd(Integer fjBxd) {
-        this.fjBxd = fjBxd;
-    }
-
-    public Integer getFjYhhd() {
-        return fjYhhd;
-    }
-
-    public void setFjYhhd(Integer fjYhhd) {
-        this.fjYhhd = fjYhhd;
-    }
-
-    public Integer getFjRkd() {
-        return fjRkd;
-    }
-
-    public void setFjRkd(Integer fjRkd) {
-        this.fjRkd = fjRkd;
-    }
-
-    public String getFjFp() {
-        return fjFp;
-    }
-
-    public void setFjFp(String fjFp) {
-        this.fjFp = fjFp;
-    }
-
-    public String getWlmc() {
-        return wlmc;
-    }
-
-    public void setWlmc(String wlmc) {
-        this.wlmc = wlmc;
-    }
-
-    public String getPzCode() {
-        return pzCode;
-    }
-
-    public void setPzCode(String pzCode) {
-        this.pzCode = pzCode;
-    }
-
-    public String getUniqueId() {
-        return uniqueId;
-    }
-
-    public void setUniqueId(String uniqueId) {
-        this.uniqueId = uniqueId;
-    }
-
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getSysOrgCode() {
-        return sysOrgCode;
-    }
-
-    public void setSysOrgCode(String sysOrgCode) {
-        this.sysOrgCode = sysOrgCode;
-    }
-
-    public String getCaigouTime() {
-        return caigouTime;
-    }
-
-    public BigDecimal getHtye() {
-        return htye;
-    }
-
-    public void setHtye(BigDecimal htye) {
-        this.htye = htye;
-    }
-
-    public BigDecimal getFpje() {
-        return fpje;
-    }
-
-    public void setFpje(BigDecimal fpje) {
-        this.fpje = fpje;
-    }
-
-    public BigDecimal getHtJe() {
-        return htJe;
-    }
-
-    public void setHtJe(BigDecimal htJe) {
-        this.htJe = htJe;
-    }
-
-    public void setCaigouTime(String caigouTime) {
-        this.caigouTime = caigouTime;
-    }
-}

+ 0 - 22
module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/mapper/KzksCostModelClPriceMapper.java

@@ -1,22 +0,0 @@
-package org.jeecg.modules.kzksCostModelClPrice.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Update;
-import org.jeecg.modules.kzksCostModelClPrice.entity.KzksCostModelClPrice;
-
-
-/**
- * @Description: kzks_cost_model_cl_price
- * @Author: jeecg-boot
- * @Date:   2023-09-18
- * @Version: V1.0
- *
- */
-@Mapper
-public interface KzksCostModelClPriceMapper extends BaseMapper<KzksCostModelClPrice> {
-
-    @Update("truncate table kzks_cost_model_cl_price;")
-     void truncateTable();
-}

+ 0 - 5
module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/mapper/xml/KzksCostModelClPriceMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.kzksCostModelClPrice.mapper.KzksCostModelClPriceMapper">
-
-</mapper>

+ 0 - 17
module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/service/IKzksCostModelClPriceService.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.kzksCostModelClPrice.service;
-
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.kzksCostModelClPrice.entity.KzksCostModelClPrice;
-
-/**
- * @Description: kzks_cost_model_cl_price
- * @Author: jeecg-boot
- * @Date:   2023-09-18
- * @Version: V1.0
- */
-public interface IKzksCostModelClPriceService extends IService<KzksCostModelClPrice> {
-
-    void truncateTable();
-
-}

+ 0 - 27
module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/service/impl/KzksCostModelClPriceServiceImpl.java

@@ -1,27 +0,0 @@
-package org.jeecg.modules.kzksCostModelClPrice.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.kzksCostModelClPrice.entity.KzksCostModelClPrice;
-import org.jeecg.modules.kzksCostModelClPrice.mapper.KzksCostModelClPriceMapper;
-import org.jeecg.modules.kzksCostModelClPrice.service.IKzksCostModelClPriceService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-
-/**
- * @Description: kzks_cost_model_cl_price
- * @Author: jeecg-boot
- * @Date:   2023-09-18
- * @Version: V1.0
- */
-@Service
-public class KzksCostModelClPriceServiceImpl extends ServiceImpl<KzksCostModelClPriceMapper, KzksCostModelClPrice> implements IKzksCostModelClPriceService {
-
-    @Autowired
-    private KzksCostModelClPriceMapper kzksCostModelClPriceMapper;
-
-    @Override
-    public void truncateTable() {
-        kzksCostModelClPriceMapper.truncateTable();
-    }
-}

+ 0 - 387
module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/vue/KzksCostModelClPriceList.vue

@@ -1,387 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24">
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 查询区域-END -->
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('kzks_cost_model_cl_price')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        :scroll="{x:true}"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
-        @change="handleTableChange">
-
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" 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 @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-
-    <kzks-cost-model-cl-price-modal ref="modalForm" @ok="modalFormOk"></kzks-cost-model-cl-price-modal>
-  </a-card>
-</template>
-
-<script>
-
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import KzksCostModelClPriceModal from './modules/KzksCostModelClPriceModal'
-
-  export default {
-    name: 'KzksCostModelClPriceList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      KzksCostModelClPriceModal
-    },
-    data () {
-      return {
-        description: 'kzks_cost_model_cl_price管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'物料编码',
-            align:"center",
-            dataIndex: 'wlbm'
-          },
-          {
-            title:'规格型号',
-            align:"center",
-            dataIndex: 'ggxh'
-          },
-          {
-            title:'质量等级',
-            align:"center",
-            dataIndex: 'zlLevel'
-          },
-          {
-            title:'单价',
-            align:"center",
-            dataIndex: 'danjia'
-          },
-          {
-            title:'批次号',
-            align:"center",
-            dataIndex: 'pici'
-          },
-          {
-            title:'供应商批次号',
-            align:"center",
-            dataIndex: 'wzGysPch'
-          },
-          {
-            title:'合同签署日期',
-            align:"center",
-            dataIndex: 'htDate'
-          },
-          {
-            title:'合同余额',
-            align:"center",
-            dataIndex: 'htye'
-          },
-          {
-            title:'发票开票时间',
-            align:"center",
-            dataIndex: 'fpDate'
-          },
-          {
-            title:'计量单位',
-            align:"center",
-            dataIndex: 'jldw'
-          },
-          {
-            title:'对方合同号',
-            align:"center",
-            dataIndex: 'dfhth'
-          },
-          {
-            title:'数量',
-            align:"center",
-            dataIndex: 'sl'
-          },
-          {
-            title:'发票金额',
-            align:"center",
-            dataIndex: 'fpje'
-          },
-          {
-            title:'供应商',
-            align:"center",
-            dataIndex: 'gys'
-          },
-          {
-            title:'凭证金额',
-            align:"center",
-            dataIndex: 'pzje'
-          },
-          {
-            title:'报销单金额',
-            align:"center",
-            dataIndex: 'bxdJe'
-          },
-          {
-            title:'合同金额',
-            align:"center",
-            dataIndex: 'htJe'
-          },
-          {
-            title:'入库单金额',
-            align:"center",
-            dataIndex: 'totalJe'
-          },
-          {
-            title:'入库单号',
-            align:"center",
-            dataIndex: 'billno'
-          },
-          {
-            title:'合同号',
-            align:"center",
-            dataIndex: 'hth'
-          },
-          {
-            title:'合同年份',
-            align:"center",
-            dataIndex: 'tYear'
-          },
-          {
-            title:'发票号',
-            align:"center",
-            dataIndex: 'fph'
-          },
-          {
-            title:'报销单号',
-            align:"center",
-            dataIndex: 'bxdBh'
-          },
-          {
-            title:'凭证日期',
-            align:"center",
-            dataIndex: 'pzrq'
-          },
-          {
-            title:'费用类别',
-            align:"center",
-            dataIndex: 'fylb'
-          },
-          {
-            title:'凭证编号',
-            align:"center",
-            dataIndex: 'pzbh'
-          },
-          {
-            title:'银行流水号',
-            align:"center",
-            dataIndex: 'yhhdBh'
-          },
-          {
-            title:'合同附件',
-            align:"center",
-            dataIndex: 'fjHt'
-          },
-          {
-            title:'凭证附件',
-            align:"center",
-            dataIndex: 'fjPz'
-          },
-          {
-            title:'报销单附件',
-            align:"center",
-            dataIndex: 'fjBxd'
-          },
-          {
-            title:'回单附件',
-            align:"center",
-            dataIndex: 'fjYhhd'
-          },
-          {
-            title:'入库单附件',
-            align:"center",
-            dataIndex: 'fjRkd'
-          },
-          {
-            title:'发票附件',
-            align:"center",
-            dataIndex: 'fjFp'
-          },
-          {
-            title:'物料名称',
-            align:"center",
-            dataIndex: 'wlmc'
-          },
-          {
-            title:'凭证唯一码',
-            align:"center",
-            dataIndex: 'pzCode'
-          },
-          {
-            title:'物料唯一码',
-            align:"center",
-            dataIndex: 'uniqueId'
-          },
-          {
-            title:'采购日期',
-            align:"center",
-            dataIndex: 'caigouTime'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
-          }
-        ],
-        url: {
-          list: "/KzksCostModelClPrice/kzksCostModelClPrice/list",
-          delete: "/KzksCostModelClPrice/kzksCostModelClPrice/delete",
-          deleteBatch: "/KzksCostModelClPrice/kzksCostModelClPrice/deleteBatch",
-          exportXlsUrl: "/KzksCostModelClPrice/kzksCostModelClPrice/exportXls",
-          importExcelUrl: "KzksCostModelClPrice/kzksCostModelClPrice/importExcel",
-
-        },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
-    this.getSuperFieldList();
-    },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
-    },
-    methods: {
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'wlbm',text:'物料编码'})
-        fieldList.push({type:'string',value:'ggxh',text:'规格型号'})
-        fieldList.push({type:'string',value:'zlLevel',text:'质量等级'})
-        fieldList.push({type:'number',value:'danjia',text:'单价'})
-        fieldList.push({type:'string',value:'pici',text:'批次号'})
-        fieldList.push({type:'string',value:'wzGysPch',text:'供应商批次号'})
-        fieldList.push({type:'string',value:'htDate',text:'合同签署日期'})
-        fieldList.push({type:'int',value:'htye',text:'合同余额'})
-        fieldList.push({type:'string',value:'fpDate',text:'发票开票时间'})
-        fieldList.push({type:'string',value:'jldw',text:'计量单位'})
-        fieldList.push({type:'string',value:'dfhth',text:'对方合同号'})
-        fieldList.push({type:'string',value:'sl',text:'数量'})
-        fieldList.push({type:'int',value:'fpje',text:'发票金额'})
-        fieldList.push({type:'string',value:'gys',text:'供应商'})
-        fieldList.push({type:'number',value:'pzje',text:'凭证金额'})
-        fieldList.push({type:'string',value:'bxdJe',text:'报销单金额'})
-        fieldList.push({type:'int',value:'htJe',text:'合同金额'})
-        fieldList.push({type:'string',value:'totalJe',text:'入库单金额'})
-        fieldList.push({type:'string',value:'billno',text:'入库单号'})
-        fieldList.push({type:'string',value:'hth',text:'合同号'})
-        fieldList.push({type:'string',value:'tYear',text:'合同年份'})
-        fieldList.push({type:'string',value:'fph',text:'发票号'})
-        fieldList.push({type:'string',value:'bxdBh',text:'报销单号'})
-        fieldList.push({type:'string',value:'pzrq',text:'凭证日期'})
-        fieldList.push({type:'string',value:'fylb',text:'费用类别'})
-        fieldList.push({type:'string',value:'pzbh',text:'凭证编号'})
-        fieldList.push({type:'string',value:'yhhdBh',text:'银行流水号'})
-        fieldList.push({type:'int',value:'fjHt',text:'合同附件'})
-        fieldList.push({type:'int',value:'fjPz',text:'凭证附件'})
-        fieldList.push({type:'int',value:'fjBxd',text:'报销单附件'})
-        fieldList.push({type:'int',value:'fjYhhd',text:'回单附件'})
-        fieldList.push({type:'int',value:'fjRkd',text:'入库单附件'})
-        fieldList.push({type:'string',value:'fjFp',text:'发票附件'})
-        fieldList.push({type:'string',value:'wlmc',text:'物料名称'})
-        fieldList.push({type:'string',value:'pzCode',text:'凭证唯一码'})
-        fieldList.push({type:'string',value:'uniqueId',text:'物料唯一码'})
-        fieldList.push({type:'string',value:'caigouTime',text:'采购日期'})
-        this.superFieldList = fieldList
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less';
-</style>

+ 0 - 17
module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/vue/KzksCostModelClPrice_menu_insert.sql

@@ -1,26 +0,0 @@
-
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_route, is_leaf, keep_alive, hidden, hide_tab, description, status, del_flag, rule_flag, create_by, create_time, update_by, update_time, internal_or_external)
-VALUES ('202309180810280240', NULL, 'kzks_cost_model_cl_price', '/KzksCostModelClPrice/kzksCostModelClPriceList', 'KzksCostModelClPrice/KzksCostModelClPriceList', NULL, NULL, 0, NULL, '1', 0.00, 0, NULL, 1, 1, 0, 0, 0, NULL, '1', 0, 0, 'admin', '2023-09-18 20:10:24', NULL, NULL, 0);
-
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202309180810280241', '202309180810280240', '添加kzks_cost_model_cl_price', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:kzks_cost_model_cl_price:add', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-09-18 20:10:24', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202309180810280242', '202309180810280240', '编辑kzks_cost_model_cl_price', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:kzks_cost_model_cl_price:edit', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-09-18 20:10:24', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202309180810280243', '202309180810280240', '删除kzks_cost_model_cl_price', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:kzks_cost_model_cl_price:delete', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-09-18 20:10:24', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202309180810280244', '202309180810280240', '批量删除kzks_cost_model_cl_price', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:kzks_cost_model_cl_price:deleteBatch', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-09-18 20:10:24', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202309180810280245', '202309180810280240', '导出excel_kzks_cost_model_cl_price', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:kzks_cost_model_cl_price:exportXls', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-09-18 20:10:24', NULL, NULL, 0, 0, '1', 0);
-INSERT INTO sys_permission(id, parent_id, name, url, component, is_route, component_name, redirect, menu_type, perms, perms_type, sort_no, always_show, icon, is_leaf, keep_alive, hidden, hide_tab, description, create_by, create_time, update_by, update_time, del_flag, rule_flag, status, internal_or_external)
-VALUES ('202309180810280246', '202309180810280240', '导入excel_kzks_cost_model_cl_price', NULL, NULL, 0, NULL, NULL, 2, 'org.jeecg.modules:kzks_cost_model_cl_price:importExcel', '1', NULL, 0, NULL, 1, 0, 0, 0, NULL, 'admin', '2023-09-18 20:10:24', NULL, NULL, 0, 0, '1', 0);

+ 0 - 284
module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/vue/modules/KzksCostModelClPriceForm.vue

@@ -1,284 +0,0 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlbm">
-              <a-input v-model="model.wlbm" placeholder="请输入物料编码"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="规格型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ggxh">
-              <a-input v-model="model.ggxh" placeholder="请输入规格型号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="质量等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zlLevel">
-              <a-input v-model="model.zlLevel" placeholder="请输入质量等级"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="danjia">
-              <a-input-number v-model="model.danjia" placeholder="请输入单价" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="批次号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pici">
-              <a-input v-model="model.pici" placeholder="请输入批次号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="供应商批次号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wzGysPch">
-              <a-input v-model="model.wzGysPch" placeholder="请输入供应商批次号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="合同签署日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htDate">
-              <a-input v-model="model.htDate" placeholder="请输入合同签署日期"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="合同余额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htye">
-              <a-input-number v-model="model.htye" placeholder="请输入合同余额" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="发票开票时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fpDate">
-              <a-input v-model="model.fpDate" placeholder="请输入发票开票时间"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="计量单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jldw">
-              <a-input v-model="model.jldw" placeholder="请输入计量单位"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="对方合同号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dfhth">
-              <a-input v-model="model.dfhth" placeholder="请输入对方合同号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sl">
-              <a-input v-model="model.sl" placeholder="请输入数量"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="发票金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fpje">
-              <a-input-number v-model="model.fpje" placeholder="请输入发票金额" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="gys">
-              <a-input v-model="model.gys" placeholder="请输入供应商"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="凭证金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pzje">
-              <a-input-number v-model="model.pzje" placeholder="请输入凭证金额" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="报销单金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bxdJe">
-              <a-input v-model="model.bxdJe" placeholder="请输入报销单金额"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="合同金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="htJe">
-              <a-input-number v-model="model.htJe" placeholder="请输入合同金额" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="入库单金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalJe">
-              <a-input v-model="model.totalJe" placeholder="请输入入库单金额"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="入库单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="billno">
-              <a-input v-model="model.billno" placeholder="请输入入库单号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="合同号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="hth">
-              <a-input v-model="model.hth" placeholder="请输入合同号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="合同年份" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tYear">
-              <a-input v-model="model.tYear" placeholder="请输入合同年份"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="发票号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fph">
-              <a-input v-model="model.fph" placeholder="请输入发票号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="报销单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bxdBh">
-              <a-input v-model="model.bxdBh" placeholder="请输入报销单号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="凭证日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pzrq">
-              <a-input v-model="model.pzrq" placeholder="请输入凭证日期"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="费用类别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fylb">
-              <a-input v-model="model.fylb" placeholder="请输入费用类别"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="凭证编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pzbh">
-              <a-input v-model="model.pzbh" placeholder="请输入凭证编号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="银行流水号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yhhdBh">
-              <a-input v-model="model.yhhdBh" placeholder="请输入银行流水号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="合同附件" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fjHt">
-              <a-input-number v-model="model.fjHt" placeholder="请输入合同附件" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="凭证附件" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fjPz">
-              <a-input-number v-model="model.fjPz" placeholder="请输入凭证附件" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="报销单附件" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fjBxd">
-              <a-input-number v-model="model.fjBxd" placeholder="请输入报销单附件" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="回单附件" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fjYhhd">
-              <a-input-number v-model="model.fjYhhd" placeholder="请输入回单附件" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="入库单附件" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fjRkd">
-              <a-input-number v-model="model.fjRkd" placeholder="请输入入库单附件" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="发票附件" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fjFp">
-              <a-input v-model="model.fjFp" placeholder="请输入发票附件"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wlmc">
-              <a-input v-model="model.wlmc" placeholder="请输入物料名称"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="凭证唯一码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pzCode">
-              <a-input v-model="model.pzCode" placeholder="请输入凭证唯一码"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="物料唯一码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="uniqueId">
-              <a-input v-model="model.uniqueId" placeholder="请输入物料唯一码"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="采购日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="caigouTime">
-              <a-input v-model="model.caigouTime" placeholder="请输入采购日期"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'KzksCostModelClPriceForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/KzksCostModelClPrice/kzksCostModelClPrice/add",
-          edit: "/KzksCostModelClPrice/kzksCostModelClPrice/edit",
-          queryById: "/KzksCostModelClPrice/kzksCostModelClPrice/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-
-        })
-      },
-    }
-  }
-</script>

+ 0 - 84
module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/vue/modules/KzksCostModelClPriceModal.Style#Drawer.vue

@@ -1,84 +0,0 @@
-<template>
-  <a-drawer
-    :title="title"
-    :width="width"
-    placement="right"
-    :closable="false"
-    @close="close"
-    destroyOnClose
-    :visible="visible">
-    <kzks-cost-model-cl-price-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></kzks-cost-model-cl-price-form>
-    <div class="drawer-footer">
-      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
-      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
-    </div>
-  </a-drawer>
-</template>
-
-<script>
-
-  import KzksCostModelClPriceForm from './KzksCostModelClPriceForm'
-
-  export default {
-    name: 'KzksCostModelClPriceModal',
-    components: {
-      KzksCostModelClPriceForm
-    },
-    data () {
-      return {
-        title:"操作",
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        });
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-  .drawer-footer{
-    position: absolute;
-    bottom: -8px;
-    width: 100%;
-    border-top: 1px solid #e8e8e8;
-    padding: 10px 16px;
-    text-align: right;
-    left: 0;
-    background: #fff;
-    border-radius: 0 0 2px 2px;
-  }
-</style>

+ 0 - 60
module_kzks/src/main/java/org/jeecg/modules/kzksCostModelClPrice/vue/modules/KzksCostModelClPriceModal.vue

@@ -1,60 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    switchFullscreen
-    @ok="handleOk"
-    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <kzks-cost-model-cl-price-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></kzks-cost-model-cl-price-form>
-  </j-modal>
-</template>
-
-<script>
-
-  import KzksCostModelClPriceForm from './KzksCostModelClPriceForm'
-  export default {
-    name: 'KzksCostModelClPriceModal',
-    components: {
-      KzksCostModelClPriceForm
-    },
-    data () {
-      return {
-        title:'',
-        width:800,
-        visible: false,
-        disableSubmit: false
-      }
-    },
-    methods: {
-      add () {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.add();
-        })
-      },
-      edit (record) {
-        this.visible=true
-        this.$nextTick(()=>{
-          this.$refs.realForm.edit(record);
-        })
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.realForm.submitForm();
-      },
-      submitCallback(){
-        this.$emit('ok');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      }
-    }
-  }
-</script>

+ 19 - 19
module_kzks/src/main/java/org/jeecg/modules/mesInfoInstallationcost/controller/MesInfoInstallationcostController.java

@@ -42,14 +42,14 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  * @Date:   2023-08-22
  * @Version: V1.0
  */
-@Api(tags="mes_info_installationcost")
+@Api(tags="装机成本")
 @RestController
 @RequestMapping("/mesInfoInstallationcost/mesInfoInstallationcost")
 @Slf4j
 public class MesInfoInstallationcostController extends JeecgController<MesInfoInstallationcost, IMesInfoInstallationcostService> {
 	@Autowired
 	private IMesInfoInstallationcostService mesInfoInstallationcostService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -59,8 +59,8 @@ public class MesInfoInstallationcostController extends JeecgController<MesInfoIn
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "mes_info_installationcost-分页列表查询")
-	@ApiOperation(value="mes_info_installationcost-分页列表查询", notes="mes_info_installationcost-分页列表查询")
+	//@AutoLog(value = "装机成本-分页列表查询")
+	@ApiOperation(value="装机成本-分页列表查询", notes="装机成本-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<MesInfoInstallationcost>> queryPageList(MesInfoInstallationcost mesInfoInstallationcost,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@@ -71,75 +71,75 @@ public class MesInfoInstallationcostController extends JeecgController<MesInfoIn
 		IPage<MesInfoInstallationcost> pageList = mesInfoInstallationcostService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
 	 * @param mesInfoInstallationcost
 	 * @return
 	 */
-	@AutoLog(value = "mes_info_installationcost-添加")
-	@ApiOperation(value="mes_info_installationcost-添加", notes="mes_info_installationcost-添加")
+	@AutoLog(value = "装机成本-添加")
+	@ApiOperation(value="装机成本-添加", notes="装机成本-添加")
 	//@RequiresPermissions("org.jeecg.modules:mes_info_installationcost:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody MesInfoInstallationcost mesInfoInstallationcost) {
 		mesInfoInstallationcostService.save(mesInfoInstallationcost);
 		return Result.OK("添加成功!");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
 	 * @param mesInfoInstallationcost
 	 * @return
 	 */
-	@AutoLog(value = "mes_info_installationcost-编辑")
-	@ApiOperation(value="mes_info_installationcost-编辑", notes="mes_info_installationcost-编辑")
+	@AutoLog(value = "装机成本-编辑")
+	@ApiOperation(value="装机成本-编辑", notes="装机成本-编辑")
 	//@RequiresPermissions("org.jeecg.modules:mes_info_installationcost:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody MesInfoInstallationcost mesInfoInstallationcost) {
 		mesInfoInstallationcostService.updateById(mesInfoInstallationcost);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "mes_info_installationcost-通过id删除")
-	@ApiOperation(value="mes_info_installationcost-通过id删除", notes="mes_info_installationcost-通过id删除")
+	@AutoLog(value = "装机成本-通过id删除")
+	@ApiOperation(value="装机成本-通过id删除", notes="装机成本-通过id删除")
 	//@RequiresPermissions("org.jeecg.modules:mes_info_installationcost:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		mesInfoInstallationcostService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "mes_info_installationcost-批量删除")
-	@ApiOperation(value="mes_info_installationcost-批量删除", notes="mes_info_installationcost-批量删除")
+	@AutoLog(value = "装机成本-批量删除")
+	@ApiOperation(value="装机成本-批量删除", notes="装机成本-批量删除")
 	//@RequiresPermissions("org.jeecg.modules:mes_info_installationcost:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.mesInfoInstallationcostService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "mes_info_installationcost-通过id查询")
-	@ApiOperation(value="mes_info_installationcost-通过id查询", notes="mes_info_installationcost-通过id查询")
+	//@AutoLog(value = "装机成本-通过id查询")
+	@ApiOperation(value="装机成本-通过id查询", notes="装机成本-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<MesInfoInstallationcost> queryById(@RequestParam(name="id",required=true) String id) {
 		MesInfoInstallationcost mesInfoInstallationcost = mesInfoInstallationcostService.getById(id);

+ 1 - 1
module_kzks/src/main/java/org/jeecg/modules/mesInfoInstallationcost/entity/MesInfoInstallationcost.java

@@ -28,7 +28,7 @@ import lombok.experimental.Accessors;
 @TableName("mes_info_installationcost")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@ApiModel(value="mes_info_installationcost对象", description="mes_info_installationcost")
+@ApiModel(value="装机成本对象", description="装机成本")
 public class MesInfoInstallationcost implements Serializable {
     private static final long serialVersionUID = 1L;