修改

SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/controller/MonitoringitemController.java

@@ -35,10 +35,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  *
@@ -132,7 +129,12 @@ public class MonitoringitemController {
         return ActionResult.success("成功");
     }
 
-
+    @ApiOperation("移动端视频流地址获取")
+    @PostMapping("/getMobileList")
+    public ActionResult list(){
+        List<HashMap<String, Object>> list = monitoringitemService.getMonitoringitemList();
+        return ActionResult.success(list);
+    }
 
     /**
      * 列表
@@ -141,6 +143,7 @@ public class MonitoringitemController {
      * @return
      */
 	@PostMapping("/getList")
+    @ApiOperation("列表")
     public ActionResult list(@RequestBody MonitoringitemPagination monitoringitemPagination)throws IOException{
         List<MonitoringitemEntity> list= monitoringitemService.getList(monitoringitemPagination);
         //处理id字段转名称，若无需转或者为空可删除

SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/mapper/MonitoringitemMapper.java

@@ -4,6 +4,9 @@ package jnpf.monitoringitem.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import jnpf.monitoringitem.entity.MonitoringitemEntity;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  *
  * 监控清单
@@ -13,5 +16,5 @@ import jnpf.monitoringitem.entity.MonitoringitemEntity;
  * 日期： 2023-02-13
  */
 public interface MonitoringitemMapper extends BaseMapper<MonitoringitemEntity> {
-
+    List<HashMap<String,Object>> getMonitorItemList();
 }

SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/MonitoringitemService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import jnpf.monitoringitem.entity.MonitoringitemEntity;
 import jnpf.monitoringitem.model.monitoringitem.MonitoringitemPagination;
 
+import java.util.HashMap;
 import java.util.List;
 /**
  *
@@ -20,7 +21,7 @@ public interface MonitoringitemService extends IService<MonitoringitemEntity> {
 
     List<MonitoringitemEntity> getTypeList(MonitoringitemPagination monitoringitemPagination,String dataType);
 
-
+    List<HashMap<String,Object>> getMonitoringitemList();
 
     MonitoringitemEntity getInfo(String id);
 

SC-boot/linkage-scm/src/main/java/jnpf/monitoringitem/service/impl/MonitoringitemServiceImpl.java

@@ -18,8 +18,10 @@ import jnpf.util.UserProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -40,7 +42,8 @@ public class MonitoringitemServiceImpl extends ServiceImpl<MonitoringitemMapper,
     @Autowired
     private AuthorizeService authorizeService;
 
-
+    @Resource
+    private MonitoringitemMapper monitoringitemMapper;
 
 
 
@@ -191,6 +194,11 @@ public class MonitoringitemServiceImpl extends ServiceImpl<MonitoringitemMapper,
         }
     }
 
+    @Override
+    public List<HashMap<String, Object>> getMonitoringitemList() {
+        return monitoringitemMapper.getMonitorItemList();
+    }
+
     @Override
     public MonitoringitemEntity getInfo(String id){
         QueryWrapper<MonitoringitemEntity> queryWrapper=new QueryWrapper<>();

SC-boot/linkage-scm/src/main/java/jnpf/supplier/controller/SupplierController.java

@@ -1,56 +1,56 @@
 
 
 package jnpf.supplier.controller;
+
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import jnpf.base.ActionResult;
-import jnpf.base.vo.PageListVO;
-import jnpf.base.vo.PaginationVO;
 import jnpf.base.UserInfo;
 import jnpf.base.vo.DownloadVO;
+import jnpf.base.vo.PageListVO;
+import jnpf.base.vo.PaginationVO;
 import jnpf.config.ConfigValueUtil;
 import jnpf.exception.DataException;
-import org.springframework.transaction.annotation.Transactional;
+import jnpf.supplier.entity.SupplierEntity;
+import jnpf.supplier.entity.SupplierMobileEntity;
 import jnpf.supplier.model.supplier.*;
-import jnpf.supplier.model.supplier.SupplierPagination;
+import jnpf.supplier.service.SupplierService;
 import jnpf.util.*;
-import lombok.extern.slf4j.Slf4j;
+import jnpf.util.enums.FileTypeEnum;
+import jnpf.util.file.UploadUtil;
 import lombok.Cleanup;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import jnpf.supplier.entity.SupplierMobileEntity;
-import jnpf.supplier.service.SupplierMobileService;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import jnpf.util.GeneraterSwapUtil;
-import java.util.*;
-
-import jnpf.util.file.UploadUtil;
-import jnpf.util.enums.FileTypeEnum;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  *
- * supplier
+ * 供应商档案
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-02-13
+ * @日期： 2023-02-16
  */
 @Slf4j
 @RestController
-@Api(tags = "supplier" , value = "supplier")
-@RequestMapping("/api/supplier/Supplier")
-public class SupplierMobileController {
+@Api(tags = "供应商档案" , value = "example")
+@RequestMapping("/api/example/Supplier")
+public class SupplierController {
 
     @Autowired
     private GeneraterSwapUtil generaterSwapUtil;
@@ -62,7 +62,7 @@ public class SupplierMobileController {
     private UserProvider userProvider;
 
     @Autowired
-    private SupplierMobileService supplierMobileService;
+    private SupplierService supplierService;
 
 
 
@@ -75,10 +75,12 @@ public class SupplierMobileController {
      */
 	@PostMapping("/getList")
     public ActionResult list(@RequestBody SupplierPagination supplierPagination)throws IOException{
-        List<SupplierMobileEntity> list= supplierMobileService.getList(supplierPagination);
+        List<SupplierMobileEntity> list= supplierService.getList(supplierPagination);
         //处理id字段转名称，若无需转或者为空可删除
     for(SupplierMobileEntity entity:list){
-            entity.setCompanyId(generaterSwapUtil.comSelectValues(entity.getCompanyId()));
+						Map<String,Object> companyIdMap = new HashMap<>();
+            entity.setCompanyId(generaterSwapUtil.getPopupSelectValue("394016341591396805","F_Id","F_FullName",entity.getCompanyId(),companyIdMap));
+            entity.setProvince(generaterSwapUtil.provinceData(entity.getProvince()));
             entity.setStatus(generaterSwapUtil.switchSelectValue(entity.getStatus() ,"1" ,"0"));
     }
 	List<SupplierListVO> listVO=JsonUtil.getJsonToList(list,SupplierListVO.class);
@@ -105,9 +107,10 @@ public class SupplierMobileController {
     public ActionResult create(@RequestBody @Valid SupplierCrForm supplierCrForm) throws DataException {
         String mainId =RandomUtil.uuId();
         UserInfo userInfo=userProvider.get();
-        SupplierMobileEntity entity = JsonUtil.getJsonToBean(supplierCrForm, SupplierMobileEntity.class);
+        supplierCrForm.setCreatorTime(DateUtil.getNow());
+        SupplierEntity entity = JsonUtil.getJsonToBean(supplierCrForm, SupplierEntity.class);
 				entity.setId(mainId);
-                supplierMobileService.save(entity);
+                supplierService.save(entity);
 
 
         return ActionResult.success("创建成功");
@@ -145,10 +148,12 @@ public class SupplierMobileController {
             return ActionResult.fail("请选择导出字段");
         }
         SupplierPagination supplierPagination=JsonUtil.getJsonToBean(supplierPaginationExportModel, SupplierPagination.class);
-        List<SupplierMobileEntity> list=  supplierMobileService.getTypeList(supplierPagination,supplierPaginationExportModel.getDataType());
+        List<SupplierEntity> list=  supplierService.getTypeList(supplierPagination,supplierPaginationExportModel.getDataType());
         //处理id字段转名称，若无需转或者为空可删除
-    for(SupplierMobileEntity entity:list){
-            entity.setCompanyId(generaterSwapUtil.comSelectValues(entity.getCompanyId()));
+    for(SupplierEntity entity:list){
+						Map<String,Object> companyIdMap = new HashMap<>();
+            entity.setCompanyId(generaterSwapUtil.getPopupSelectValue("394016341591396805","F_Id","F_FullName",entity.getCompanyId(),companyIdMap));
+            entity.setProvince(generaterSwapUtil.provinceData(entity.getProvince()));
             entity.setStatus(generaterSwapUtil.switchSelectValue(entity.getStatus() ,"1" ,"0"));
     }
 	List<SupplierListVO> listVO=JsonUtil.getJsonToList(list,SupplierListVO.class);
@@ -172,33 +177,75 @@ public class SupplierMobileController {
                     case "supplierCode" :
                     entitys.add(new ExcelExportEntity("供应商编码" ,"supplierCode"));
                     break;
+                    case "companyId" :
+                    entitys.add(new ExcelExportEntity("所属公司" ,"companyId"));
+                    break;
                     case "supplierName" :
                     entitys.add(new ExcelExportEntity("供应商名称" ,"supplierName"));
                     break;
-                    case "supplierSiteId" :
-                    entitys.add(new ExcelExportEntity("供应商地点ID" ,"supplierSiteId"));
+                    case "country" :
+                    entitys.add(new ExcelExportEntity("国家" ,"country"));
                     break;
-                    case "supplierSiteCode" :
-                    entitys.add(new ExcelExportEntity("供应商地点名称" ,"supplierSiteCode"));
+                    case "supply" :
+                    entitys.add(new ExcelExportEntity("供货指标" ,"supply"));
                     break;
-                    case "companyId" :
-                    entitys.add(new ExcelExportEntity("公司名称" ,"companyId"));
-                    break;
-                    case "address" :
-                    entitys.add(new ExcelExportEntity("地址" ,"address"));
+                    case "province" :
+                    entitys.add(new ExcelExportEntity("省" ,"province"));
                     break;
                     case "contactName" :
                     entitys.add(new ExcelExportEntity("联系人" ,"contactName"));
                     break;
+                    case "supplierLevel" :
+                    entitys.add(new ExcelExportEntity("供应商等级" ,"supplierLevel"));
+                    break;
                     case "contactPhone" :
                     entitys.add(new ExcelExportEntity("联系电话" ,"contactPhone"));
                     break;
-                    case "supplierLevel" :
-                    entitys.add(new ExcelExportEntity("供应商等级" ,"supplierLevel"));
+                    case "enterprise" :
+                    entitys.add(new ExcelExportEntity("供应商性质" ,"enterprise"));
+                    break;
+                    case "address" :
+                    entitys.add(new ExcelExportEntity("地址" ,"address"));
+                    break;
+                    case "classification" :
+                    entitys.add(new ExcelExportEntity("供应商类型" ,"classification"));
+                    break;
+                    case "bank" :
+                    entitys.add(new ExcelExportEntity("开户行" ,"bank"));
+                    break;
+                    case "vatRegistrationNum" :
+                    entitys.add(new ExcelExportEntity("纳税编号" ,"vatRegistrationNum"));
+                    break;
+                    case "bankAccount" :
+                    entitys.add(new ExcelExportEntity("银行账户" ,"bankAccount"));
+                    break;
+                    case "taxCode" :
+                    entitys.add(new ExcelExportEntity("默认税码" ,"taxCode"));
+                    break;
+                    case "payable" :
+                    entitys.add(new ExcelExportEntity("应付科目" ,"payable"));
+                    break;
+                    case "isPurchase" :
+                    entitys.add(new ExcelExportEntity("是否采购" ,"isPurchase"));
+                    break;
+                    case "prepaid" :
+                    entitys.add(new ExcelExportEntity("预付科目" ,"prepaid"));
+                    break;
+                    case "isPayment" :
+                    entitys.add(new ExcelExportEntity("是否付款" ,"isPayment"));
                     break;
                     case "status" :
                     entitys.add(new ExcelExportEntity("启用" ,"status"));
                     break;
+                    case "supplierSiteCode" :
+                    entitys.add(new ExcelExportEntity("供应商地点" ,"supplierSiteCode"));
+                    break;
+                    case "creatorTime" :
+                    entitys.add(new ExcelExportEntity("创建时间" ,"creatorTime"));
+                    break;
+                    case "lastModifyTime" :
+                    entitys.add(new ExcelExportEntity("修改时间" ,"lastModifyTime"));
+                    break;
             default:
                     break;
                     }
@@ -260,8 +307,14 @@ public class SupplierMobileController {
     */
     @GetMapping("/{id}")
     public ActionResult<SupplierInfoVO> info(@PathVariable("id") String id){
-        SupplierMobileEntity entity= supplierMobileService.getInfo(id);
+        SupplierEntity entity= supplierService.getInfo(id);
         SupplierInfoVO vo=JsonUtil.getJsonToBean(entity, SupplierInfoVO.class);
+        if(vo.getCreatorTime()!=null){
+            vo.setCreatorTime(vo.getCreatorTime());
+        }
+        if(vo.getLastModifyTime()!=null){
+            vo.setLastModifyTime(vo.getLastModifyTime());
+        }
 
     //子表
     //副表
@@ -276,7 +329,7 @@ public class SupplierMobileController {
     */
     @GetMapping("/detail/{id}")
     public ActionResult<SupplierInfoVO> detailInfo(@PathVariable("id") String id){
-        SupplierMobileEntity entity= supplierMobileService.getInfo(id);
+        SupplierEntity entity= supplierService.getInfo(id);
         SupplierInfoVO vo=JsonUtil.getJsonToBean(entity, SupplierInfoVO.class);
 
  //子表数据转换
@@ -284,7 +337,9 @@ public class SupplierMobileController {
  //附表数据转换
 
 //添加到详情表单对象中
-            vo.setCompanyId(generaterSwapUtil.comSelectValues(vo.getCompanyId()));
+						Map<String,Object> companyIdMap = new HashMap<>();
+            vo.setCompanyId(generaterSwapUtil.getPopupSelectValue("394016341591396805","F_Id","F_FullName",vo.getCompanyId(),companyIdMap));
+            vo.setProvince(generaterSwapUtil.provinceData(vo.getProvince()));
             vo.setStatus(generaterSwapUtil.switchSelectValue(vo.getStatus() ,"1" ,"0"));
 
         return ActionResult.success(vo);
@@ -303,10 +358,12 @@ public class SupplierMobileController {
     @Transactional
     public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid SupplierUpForm supplierUpForm) throws DataException {
         UserInfo userInfo=userProvider.get();
-        SupplierMobileEntity entity= supplierMobileService.getInfo(id);
+        SupplierEntity entity= supplierService.getInfo(id);
         if(entity!=null){
-            SupplierMobileEntity subentity=JsonUtil.getJsonToBean(supplierUpForm, SupplierMobileEntity.class);
-            supplierMobileService.update(id, subentity);
+                supplierUpForm.setLastModifyTime(DateUtil.getNow());
+            SupplierEntity subentity=JsonUtil.getJsonToBean(supplierUpForm, SupplierEntity.class);
+					subentity.setCreatorTime(entity.getCreatorTime());
+            supplierService.update(id, subentity);
         return ActionResult.success("更新成功");
         }else{
             return ActionResult.fail("更新失败，数据不存在");
@@ -324,9 +381,9 @@ public class SupplierMobileController {
     @DeleteMapping("/{id}")
     @Transactional
     public ActionResult delete(@PathVariable("id") String id){
-        SupplierMobileEntity entity= supplierMobileService.getInfo(id);
+        SupplierEntity entity= supplierService.getInfo(id);
         if(entity!=null){
-            supplierMobileService.delete(entity);
+            supplierService.delete(entity);
 
         }
         return ActionResult.success("删除成功");
@@ -337,9 +394,4 @@ public class SupplierMobileController {
 
 
 
-
-
-
-
-
 }

SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java

@@ -0,0 +1,131 @@
+package jnpf.supplier.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+
+/**
+ *
+ * 供应商档案 
+ * @版本： V3.2.0
+ * @版权： LINKAGE-BOOT
+ * @作者： LINKAGE-BOOT研发团队
+ * @日期： 2023-02-16
+ */
+@Data
+@TableName("jg_supplier")
+public class SupplierEntity  {
+
+    @TableId("ID")
+    private String id;
+
+    @TableField("CREATOR_USER_ID")
+    private String creatorUserId;
+
+    @TableField("CREATOR_USER_NAME")
+    private String creatorUserName;
+
+    @TableField("CREATOR_TIME")
+    private Date creatorTime;
+
+    @TableField("LAST_MODIFY_USER_ID")
+    private String lastModifyUserId;
+
+    @TableField("LAST_MODIFY_USER_NAME")
+    private String lastModifyUserName;
+
+    @TableField("LAST_MODIFY_TIME")
+    private Date lastModifyTime;
+
+    @TableField("DELETE_USER_ID")
+    private String deleteUserId;
+
+    @TableField("DELETE_USER_NAME")
+    private String deleteUserName;
+
+    @TableField("DELETE_TIME")
+    private Date deleteTime;
+
+    @TableField("DELETE_MARK")
+    private String deleteMark;
+
+    @TableField("SUPPLIER_CODE")
+    private String supplierCode;
+
+    @TableField("SUPPLIER_NAME")
+    private String supplierName;
+
+    @TableField("SUPPLIER_SITE_ID")
+    private String supplierSiteId;
+
+    @TableField("SUPPLIER_SITE_CODE")
+    private String supplierSiteCode;
+
+    @TableField("COMPANY_ID")
+    private String companyId;
+
+    @TableField("VAT_REGISTRATION_NUM")
+    private String vatRegistrationNum;
+
+    @TableField("ORGNIZE_ID")
+    private String orgnizeId;
+
+    @TableField("DEPARTMENT_ID")
+    private String departmentId;
+
+    @TableField("SUPPLY")
+    private Integer supply;
+
+    @TableField("CONTACT_NAME")
+    private String contactName;
+
+    @TableField("CONTACT_PHONE")
+    private String contactPhone;
+
+    @TableField("SUPPLIER_LEVEL")
+    private String supplierLevel;
+
+    @TableField("ADDRESS")
+    private String address;
+
+    @TableField("STATUS")
+    private String status;
+
+    @TableField("COUNTRY")
+    private String country;
+
+    @TableField("PROVINCE")
+    private String province;
+
+    @TableField("CLASSIFICATION")
+    private String classification;
+
+    @TableField("ENTERPRISE")
+    private String enterprise;
+
+    @TableField("BANK")
+    private String bank;
+
+    @TableField("BANK_ACCOUNT")
+    private String bankAccount;
+
+    @TableField("TAX_CODE")
+    private String taxCode;
+
+    @TableField("PAYABLE")
+    private String payable;
+
+    @TableField("PREPAID")
+    private String prepaid;
+
+    @TableField("IS_PURCHASE")
+    private String isPurchase;
+
+    @TableField("IS_PAYMENT")
+    private String isPayment;
+
+}

SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierMobileEntity.java

@@ -1,25 +1,19 @@
 package jnpf.supplier.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 
 /**
- *
- * 供应商档案 
- * @版本： V3.2.0
- * @版权： LINKAGE-BOOT
- * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-02-13
+ * @Author: WangChuang
+ * @Date: 16/2/2023  上午10:06
+ * @Description //注释：
+ * @Version 1.0
  */
 @Data
-@TableName("jg_supplier")
 public class SupplierMobileEntity {
 
     @TableId("ID")
@@ -70,9 +64,6 @@ public class SupplierMobileEntity {
     @TableField("COMPANY_ID")
     private String companyId;
 
-    @TableField("COMPANY_NAME")
-    private String companyName;
-
     @TableField("VAT_REGISTRATION_NUM")
     private String vatRegistrationNum;
 
@@ -100,4 +91,46 @@ public class SupplierMobileEntity {
     @TableField("STATUS")
     private String status;
 
+    @TableField("COUNTRY")
+    private String country;
+
+    @TableField("PROVINCE")
+    private String province;
+
+    @TableField("CLASSIFICATION")
+    private String classification;
+
+    @TableField("ENTERPRISE")
+    private String enterprise;
+
+    @TableField("BANK")
+    private String bank;
+
+    @TableField("BANK_ACCOUNT")
+    private String bankAccount;
+
+    @TableField("TAX_CODE")
+    private String taxCode;
+
+    @TableField("PAYABLE")
+    private String payable;
+
+    @TableField("PREPAID")
+    private String prepaid;
+
+    @TableField("IS_PURCHASE")
+    private String isPurchase;
+
+    @TableField("IS_PAYMENT")
+    private String isPayment;
+
+    private BigDecimal settlemenSum;
+
+    private BigDecimal weightSum;
+
+    private BigDecimal buckleWeightSum;
+
+    private BigDecimal grossWeightSum;
+
+    private BigDecimal salesPriceSum;
 }

SC-boot/linkage-scm/src/main/java/jnpf/supplier/mapper/SupplierMapper.java

@@ -0,0 +1,23 @@
+package jnpf.supplier.mapper;
+
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jnpf.supplier.entity.SupplierEntity;
+import jnpf.supplier.entity.SupplierMobileEntity;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ *
+ * 供应商档案
+ * 版本： V3.2.0
+ * 版权： LINKAGE-BOOT
+ * 作者： LINKAGE-BOOT研发团队
+ * 日期： 2023-02-16
+ */
+public interface SupplierMapper extends BaseMapper<SupplierEntity> {
+
+    IPage<SupplierMobileEntity> getSupplierList(@Param("page") Page<SupplierMobileEntity> page,@Param("ew") Wrapper<SupplierEntity> queryWrapper);
+}

SC-boot/linkage-scm/src/main/java/jnpf/supplier/mapper/SupplierMobileMapper.java

@@ -1,17 +0,0 @@
-package jnpf.supplier.mapper;
-
-
-import jnpf.supplier.entity.SupplierMobileEntity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- *
- * supplier
- * 版本： V3.2.0
- * 版权： LINKAGE-BOOT
- * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-02-13
- */
-public interface SupplierMobileMapper extends BaseMapper<SupplierMobileEntity> {
-
-}

SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierCrForm.java

@@ -14,7 +14,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-02-13
+ * @日期： 2023-02-16
  */
 @Data
 public class SupplierCrForm  {
@@ -23,42 +23,98 @@ public class SupplierCrForm  {
     @JsonProperty("supplierCode")
     private String supplierCode;
 
+    /** 所属公司 **/
+    @JsonProperty("companyId")
+    private String companyId;
+
     /** 供应商名称 **/
     @JsonProperty("supplierName")
     private String supplierName;
 
-    /** 供应商地点ID **/
-    @JsonProperty("supplierSiteId")
-    private String supplierSiteId;
+    /** 国家 **/
+    @JsonProperty("country")
+    private String country;
 
-    /** 供应商地点名称 **/
-    @JsonProperty("supplierSiteCode")
-    private String supplierSiteCode;
+    /** 供货指标 **/
+    @JsonProperty("supply")
+    private String supply;
 
-    /** 公司名称 **/
-    @JsonProperty("companyId")
-    private String companyId;
-
-    /** 地址 **/
-    @JsonProperty("address")
-    private String address;
+    /** 省 **/
+    @JsonProperty("province")
+    private String province;
 
     /** 联系人 **/
     @JsonProperty("contactName")
     private String contactName;
 
+    /** 供应商等级 **/
+    @JsonProperty("supplierLevel")
+    private String supplierLevel;
+
     /** 联系电话 **/
     @JsonProperty("contactPhone")
     private String contactPhone;
 
-    /** 供应商等级 **/
-    @JsonProperty("supplierLevel")
-    private String supplierLevel;
+    /** 供应商性质 **/
+    @JsonProperty("enterprise")
+    private String enterprise;
+
+    /** 地址 **/
+    @JsonProperty("address")
+    private String address;
+
+    /** 供应商类型 **/
+    @JsonProperty("classification")
+    private String classification;
+
+    /** 开户行 **/
+    @JsonProperty("bank")
+    private String bank;
+
+    /** 纳税编号 **/
+    @JsonProperty("vatRegistrationNum")
+    private String vatRegistrationNum;
+
+    /** 银行账户 **/
+    @JsonProperty("bankAccount")
+    private String bankAccount;
+
+    /** 默认税码 **/
+    @JsonProperty("taxCode")
+    private String taxCode;
+
+    /** 应付科目 **/
+    @JsonProperty("payable")
+    private String payable;
+
+    /** 是否采购 **/
+    @JsonProperty("isPurchase")
+    private String isPurchase;
+
+    /** 预付科目 **/
+    @JsonProperty("prepaid")
+    private String prepaid;
+
+    /** 是否付款 **/
+    @JsonProperty("isPayment")
+    private String isPayment;
 
     /** 启用 **/
     @JsonProperty("status")
     private String status;
 
+    /** 供应商地点 **/
+    @JsonProperty("supplierSiteCode")
+    private String supplierSiteCode;
+
+    /** 创建时间 **/
+    @JsonProperty("creatorTime")
+    private String creatorTime;
+
+    /** 修改时间 **/
+    @JsonProperty("lastModifyTime")
+    private String lastModifyTime;
+
 
 
 }

SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierInfoVO.java

@@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-02-13
+ * @日期： 2023-02-16
  */
 @Data
 public class SupplierInfoVO{
@@ -27,40 +27,98 @@ public class SupplierInfoVO{
         @JsonProperty("supplierCode")
         private String supplierCode;
 
+        /** 所属公司 **/
+        @JsonProperty("companyId")
+        private String companyId;
+
         /** 供应商名称 **/
         @JsonProperty("supplierName")
         private String supplierName;
 
-        /** 供应商地点ID **/
-        @JsonProperty("supplierSiteId")
-        private String supplierSiteId;
+        /** 国家 **/
+        @JsonProperty("country")
+        private String country;
 
-        /** 供应商地点名称 **/
-        @JsonProperty("supplierSiteCode")
-        private String supplierSiteCode;
+        /** 供货指标 **/
+        @JsonProperty("supply")
+        private String supply;
 
-        /** 公司名称 **/
-        @JsonProperty("companyId")
-        private String companyId;
-
-        /** 地址 **/
-        @JsonProperty("address")
-        private String address;
+        /** 省 **/
+        @JsonProperty("province")
+        private String province;
 
         /** 联系人 **/
         @JsonProperty("contactName")
         private String contactName;
 
+        /** 供应商等级 **/
+        @JsonProperty("supplierLevel")
+        private String supplierLevel;
+
         /** 联系电话 **/
         @JsonProperty("contactPhone")
         private String contactPhone;
 
-        /** 供应商等级 **/
-        @JsonProperty("supplierLevel")
-        private String supplierLevel;
+        /** 供应商性质 **/
+        @JsonProperty("enterprise")
+        private String enterprise;
+
+        /** 地址 **/
+        @JsonProperty("address")
+        private String address;
+
+        /** 供应商类型 **/
+        @JsonProperty("classification")
+        private String classification;
+
+        /** 开户行 **/
+        @JsonProperty("bank")
+        private String bank;
+
+        /** 纳税编号 **/
+        @JsonProperty("vatRegistrationNum")
+        private String vatRegistrationNum;
+
+        /** 银行账户 **/
+        @JsonProperty("bankAccount")
+        private String bankAccount;
+
+        /** 默认税码 **/
+        @JsonProperty("taxCode")
+        private String taxCode;
+
+        /** 应付科目 **/
+        @JsonProperty("payable")
+        private String payable;
+
+        /** 是否采购 **/
+        @JsonProperty("isPurchase")
+        private String isPurchase;
+
+        /** 预付科目 **/
+        @JsonProperty("prepaid")
+        private String prepaid;
+
+        /** 是否付款 **/
+        @JsonProperty("isPayment")
+        private String isPayment;
 
         /** 启用 **/
         @JsonProperty("status")
         private String status;
 
+        /** 供应商地点 **/
+        @JsonProperty("supplierSiteCode")
+        private String supplierSiteCode;
+
+        /** 创建时间 **/
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+        @JsonProperty("creatorTime")
+        private Date  creatorTime;
+
+        /** 修改时间 **/
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+        @JsonProperty("lastModifyTime")
+        private Date  lastModifyTime;
+
 }

SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierListQuery.java

@@ -10,7 +10,7 @@ import java.util.List;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-02-13
+ * @日期： 2023-02-16
  */
 @Data
 public class SupplierListQuery extends Pagination {
@@ -20,6 +20,15 @@ public class SupplierListQuery extends Pagination {
 
         /** 供应商名称 */
         private String supplierName;
+
+        /** 联系人 */
+        private String contactName;
+
+        /** 联系电话 */
+        private String contactPhone;
+
+        /** 供应商地点 */
+        private String supplierSiteCode;
 	/**
     * 菜单id
     */

SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierListVO.java

@@ -3,19 +3,19 @@
 package jnpf.supplier.model.supplier;
 
 
-import lombok.Data;
-import java.sql.Time;
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
 import java.math.BigDecimal;
+import java.util.Date;
 /**
  *
  * 
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-02-13
+ * @日期： 2023-02-16
  */
 @Data
 public class SupplierListVO{
@@ -29,29 +29,29 @@ public class SupplierListVO{
     private String supplierCode;
 
 
+    /** 所属公司 **/
+    @JsonProperty("companyId")
+    private String companyId;
+
+
     /** 供应商名称 **/
     @JsonProperty("supplierName")
     private String supplierName;
 
 
-    /** 供应商地点ID **/
-    @JsonProperty("supplierSiteId")
-    private String supplierSiteId;
+    /** 国家 **/
+    @JsonProperty("country")
+    private String country;
 
 
-    /** 供应商地点名称 **/
-    @JsonProperty("supplierSiteCode")
-    private String supplierSiteCode;
+    /** 供货指标 **/
+    @JsonProperty("supply")
+    private String supply;
 
 
-    /** 公司名称 **/
-    @JsonProperty("companyId")
-    private String companyId;
-
-
-    /** 地址 **/
-    @JsonProperty("address")
-    private String address;
+    /** 省 **/
+    @JsonProperty("province")
+    private String province;
 
 
     /** 联系人 **/
@@ -59,14 +59,69 @@ public class SupplierListVO{
     private String contactName;
 
 
+    /** 供应商等级 **/
+    @JsonProperty("supplierLevel")
+    private String supplierLevel;
+
+
     /** 联系电话 **/
     @JsonProperty("contactPhone")
     private String contactPhone;
 
 
-    /** 供应商等级 **/
-    @JsonProperty("supplierLevel")
-    private String supplierLevel;
+    /** 供应商性质 **/
+    @JsonProperty("enterprise")
+    private String enterprise;
+
+
+    /** 地址 **/
+    @JsonProperty("address")
+    private String address;
+
+
+    /** 供应商类型 **/
+    @JsonProperty("classification")
+    private String classification;
+
+
+    /** 开户行 **/
+    @JsonProperty("bank")
+    private String bank;
+
+
+    /** 纳税编号 **/
+    @JsonProperty("vatRegistrationNum")
+    private String vatRegistrationNum;
+
+
+    /** 银行账户 **/
+    @JsonProperty("bankAccount")
+    private String bankAccount;
+
+
+    /** 默认税码 **/
+    @JsonProperty("taxCode")
+    private String taxCode;
+
+
+    /** 应付科目 **/
+    @JsonProperty("payable")
+    private String payable;
+
+
+    /** 是否采购 **/
+    @JsonProperty("isPurchase")
+    private String isPurchase;
+
+
+    /** 预付科目 **/
+    @JsonProperty("prepaid")
+    private String prepaid;
+
+
+    /** 是否付款 **/
+    @JsonProperty("isPayment")
+    private String isPayment;
 
 
     /** 启用 **/
@@ -74,4 +129,30 @@ public class SupplierListVO{
     private String status;
 
 
+    /** 供应商地点 **/
+    @JsonProperty("supplierSiteCode")
+    private String supplierSiteCode;
+
+
+    /** 创建时间 **/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonProperty("creatorTime")
+    private Date  creatorTime;
+
+
+    /** 修改时间 **/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonProperty("lastModifyTime")
+    private Date  lastModifyTime;
+
+
+    private BigDecimal settlemenSum;
+
+    private BigDecimal weightSum;
+
+    private BigDecimal buckleWeightSum;
+
+    private BigDecimal grossWeightSum;
+
+    private BigDecimal salesPriceSum;
 }

SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierPagination.java

@@ -11,7 +11,7 @@ import java.util.List;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-02-13
+ * @日期： 2023-02-16
  */
 @Data
 public class SupplierPagination extends Pagination {
@@ -21,6 +21,15 @@ public class SupplierPagination extends Pagination {
 
         /** 供应商名称 */
         private String supplierName;
+
+        /** 联系人 */
+        private String contactName;
+
+        /** 联系电话 */
+        private String contactPhone;
+
+        /** 供应商地点 */
+        private String supplierSiteCode;
 	/**
     * 菜单id
     */

SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierPaginationExportModel.java

@@ -9,7 +9,7 @@ import java.util.*;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-02-13
+ * @日期： 2023-02-16
  */
 @Data
 public class SupplierPaginationExportModel extends Pagination {
@@ -26,4 +26,13 @@ public class SupplierPaginationExportModel extends Pagination {
 
 			/** 供应商名称 */
     private String supplierName;
+
+			/** 联系人 */
+    private String contactName;
+
+			/** 联系电话 */
+    private String contactPhone;
+
+			/** 供应商地点 */
+    private String supplierSiteCode;
 }

SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupplierUpForm.java

@@ -15,7 +15,7 @@ import lombok.Data;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-02-13
+ * @日期： 2023-02-16
  */
 @Data
 public class SupplierUpForm{
@@ -28,29 +28,29 @@ public class SupplierUpForm{
     private String supplierCode;
 
 
+    /** 所属公司 **/
+    @JsonProperty("companyId")
+    private String companyId;
+
+
     /** 供应商名称 **/
     @JsonProperty("supplierName")
     private String supplierName;
 
 
-    /** 供应商地点ID **/
-    @JsonProperty("supplierSiteId")
-    private String supplierSiteId;
+    /** 国家 **/
+    @JsonProperty("country")
+    private String country;
 
 
-    /** 供应商地点名称 **/
-    @JsonProperty("supplierSiteCode")
-    private String supplierSiteCode;
+    /** 供货指标 **/
+    @JsonProperty("supply")
+    private String supply;
 
 
-    /** 公司名称 **/
-    @JsonProperty("companyId")
-    private String companyId;
-
-
-    /** 地址 **/
-    @JsonProperty("address")
-    private String address;
+    /** 省 **/
+    @JsonProperty("province")
+    private String province;
 
 
     /** 联系人 **/
@@ -58,14 +58,69 @@ public class SupplierUpForm{
     private String contactName;
 
 
+    /** 供应商等级 **/
+    @JsonProperty("supplierLevel")
+    private String supplierLevel;
+
+
     /** 联系电话 **/
     @JsonProperty("contactPhone")
     private String contactPhone;
 
 
-    /** 供应商等级 **/
-    @JsonProperty("supplierLevel")
-    private String supplierLevel;
+    /** 供应商性质 **/
+    @JsonProperty("enterprise")
+    private String enterprise;
+
+
+    /** 地址 **/
+    @JsonProperty("address")
+    private String address;
+
+
+    /** 供应商类型 **/
+    @JsonProperty("classification")
+    private String classification;
+
+
+    /** 开户行 **/
+    @JsonProperty("bank")
+    private String bank;
+
+
+    /** 纳税编号 **/
+    @JsonProperty("vatRegistrationNum")
+    private String vatRegistrationNum;
+
+
+    /** 银行账户 **/
+    @JsonProperty("bankAccount")
+    private String bankAccount;
+
+
+    /** 默认税码 **/
+    @JsonProperty("taxCode")
+    private String taxCode;
+
+
+    /** 应付科目 **/
+    @JsonProperty("payable")
+    private String payable;
+
+
+    /** 是否采购 **/
+    @JsonProperty("isPurchase")
+    private String isPurchase;
+
+
+    /** 预付科目 **/
+    @JsonProperty("prepaid")
+    private String prepaid;
+
+
+    /** 是否付款 **/
+    @JsonProperty("isPayment")
+    private String isPayment;
 
 
     /** 启用 **/
@@ -73,4 +128,19 @@ public class SupplierUpForm{
     private String status;
 
 
+    /** 供应商地点 **/
+    @JsonProperty("supplierSiteCode")
+    private String supplierSiteCode;
+
+
+    /** 创建时间 **/
+    @JsonProperty("creatorTime")
+    private String creatorTime;
+
+
+    /** 修改时间 **/
+    @JsonProperty("lastModifyTime")
+    private String lastModifyTime;
+
+
 }

SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/SupplierMobileService.java

@@ -1,34 +0,0 @@
-package jnpf.supplier.service;
-
-import jnpf.supplier.entity.SupplierMobileEntity;
-import com.baomidou.mybatisplus.extension.service.IService;
-import jnpf.supplier.model.supplier.SupplierPagination;
-import java.util.*;
-/**
- *
- * supplier
- * 版本： V3.2.0
- * 版权： LINKAGE-BOOT
- * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-02-13
- */
-public interface SupplierMobileService extends IService<SupplierMobileEntity> {
-
-    List<SupplierMobileEntity> getList(SupplierPagination supplierPagination);
-
-    List<SupplierMobileEntity> getTypeList(SupplierPagination supplierPagination, String dataType);
-
-
-
-    SupplierMobileEntity getInfo(String id);
-
-    void delete(SupplierMobileEntity entity);
-
-    void create(SupplierMobileEntity entity);
-
-    boolean update( String id, SupplierMobileEntity entity);
-    
-//  子表方法
-
-    //列表子表数据方法
-}

SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/SupplierService.java

@@ -0,0 +1,44 @@
+package jnpf.supplier.service;
+
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import jnpf.supplier.entity.SupplierEntity;
+import jnpf.supplier.entity.SupplierMobileEntity;
+import jnpf.supplier.model.supplier.SupplierPagination;
+
+import java.util.List;
+
+/**
+ *
+ * 供应商档案
+ * 版本： V3.2.0
+ * 版权： LINKAGE-BOOT
+ * 作者： LINKAGE-BOOT研发团队
+ * 日期： 2023-02-16
+ */
+public interface SupplierService extends IService<SupplierEntity> {
+
+    List<SupplierMobileEntity> getList(SupplierPagination supplierPagination);
+
+    List<SupplierEntity> getTypeList(SupplierPagination supplierPagination,String dataType);
+
+
+
+    SupplierEntity getInfo(String id);
+
+    void delete(SupplierEntity entity);
+
+    void create(SupplierEntity entity);
+
+    boolean update( String id, SupplierEntity entity);
+
+
+
+    IPage<SupplierMobileEntity> page(Page<SupplierMobileEntity> page, Wrapper<SupplierEntity> queryWrapper) ;
+//  子表方法
+
+    //列表子表数据方法
+}

SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java

@@ -1,38 +1,40 @@
 package jnpf.supplier.service.impl;
 
-import jnpf.supplier.entity.*;
-import jnpf.supplier.mapper.SupplierMobileMapper;
-import jnpf.supplier.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
-
-
+import jnpf.permission.service.AuthorizeService;
+import jnpf.supplier.entity.SupplierEntity;
+import jnpf.supplier.entity.SupplierMobileEntity;
+import jnpf.supplier.mapper.SupplierMapper;
 import jnpf.supplier.model.supplier.SupplierPagination;
+import jnpf.supplier.service.SupplierService;
+import jnpf.util.ServletUtil;
+import jnpf.util.StringUtil;
+import jnpf.util.UserProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-import jnpf.permission.service.AuthorizeService;
+import javax.annotation.Resource;
 import java.lang.reflect.Field;
-import com.baomidou.mybatisplus.annotation.TableField;
-
-
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import jnpf.util.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  *
- * supplier
+ * 供应商档案
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-02-13
+ * 日期： 2023-02-16
  */
 @Service
-public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper, SupplierMobileEntity> implements SupplierMobileService {
+public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, SupplierEntity> implements SupplierService {
 
 
     @Autowired
@@ -41,7 +43,8 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
     @Autowired
     private AuthorizeService authorizeService;
 
-
+    @Resource
+    private SupplierMapper supplierMapper;
 
 
 
@@ -51,7 +54,7 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
         List<String> AllIdList =new ArrayList();
         int total=0;
 		int supplierNum =0;
-        QueryWrapper<SupplierMobileEntity> supplierQueryWrapper=new QueryWrapper<>();
+        QueryWrapper<SupplierEntity> supplierQueryWrapper=new QueryWrapper<>();
     boolean pcPermission = false;
     boolean appPermission = false;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@@ -61,7 +64,7 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
             if (ObjectUtil.isEmpty(supplierObj)){
                 return new ArrayList<>();
             } else {
-                supplierQueryWrapper = (QueryWrapper<SupplierMobileEntity>)supplierObj;
+                supplierQueryWrapper = (QueryWrapper<SupplierEntity>)supplierObj;
                 supplierNum++;
             }
         }
@@ -72,7 +75,7 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
             if (ObjectUtil.isEmpty(supplierObj)){
                 return new ArrayList<>();
             } else {
-            supplierQueryWrapper = (QueryWrapper<SupplierMobileEntity>)supplierObj;
+            supplierQueryWrapper = (QueryWrapper<SupplierEntity>)supplierObj;
              supplierNum++;
 			}
 
@@ -81,25 +84,40 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
     }
 			if(StringUtil.isNotEmpty(supplierPagination.getSupplierCode())){
             supplierNum++;
-            supplierQueryWrapper.lambda().like(SupplierMobileEntity::getSupplierCode,supplierPagination.getSupplierCode());
+            supplierQueryWrapper.lambda().like(SupplierEntity::getSupplierCode,supplierPagination.getSupplierCode());
                     }
 
 			if(StringUtil.isNotEmpty(supplierPagination.getSupplierName())){
             supplierNum++;
-            supplierQueryWrapper.lambda().like(SupplierMobileEntity::getSupplierName,supplierPagination.getSupplierName());
+            supplierQueryWrapper.lambda().like(SupplierEntity::getSupplierName,supplierPagination.getSupplierName());
+                    }
+
+			if(StringUtil.isNotEmpty(supplierPagination.getContactName())){
+            supplierNum++;
+            supplierQueryWrapper.lambda().like(SupplierEntity::getContactName,supplierPagination.getContactName());
+                    }
+
+			if(StringUtil.isNotEmpty(supplierPagination.getContactPhone())){
+            supplierNum++;
+            supplierQueryWrapper.lambda().like(SupplierEntity::getContactPhone,supplierPagination.getContactPhone());
+                    }
+
+			if(StringUtil.isNotEmpty(supplierPagination.getSupplierSiteCode())){
+            supplierNum++;
+            supplierQueryWrapper.lambda().like(SupplierEntity::getSupplierSiteCode,supplierPagination.getSupplierSiteCode());
                     }
 
         if(AllIdList.size()>0){
-            supplierQueryWrapper.lambda().in(SupplierMobileEntity::getId, AllIdList);
+            supplierQueryWrapper.lambda().in(SupplierEntity::getId, AllIdList);
         }
         //排序
         if(StringUtil.isEmpty(supplierPagination.getSidx())){
-        supplierQueryWrapper.lambda().orderByDesc(SupplierMobileEntity::getSupplierCode);
+        supplierQueryWrapper.lambda().orderByDesc(SupplierEntity::getCreatorTime);
         }else{
             try {
                 String sidx = supplierPagination.getSidx();
-                SupplierMobileEntity supplierMobileEntity = new SupplierMobileEntity();
-                Field declaredField = supplierMobileEntity.getClass().getDeclaredField(sidx);
+                SupplierEntity supplierEntity = new SupplierEntity();
+                Field declaredField = supplierEntity.getClass().getDeclaredField(sidx);
                 declaredField.setAccessible(true);
                 String value = declaredField.getAnnotation(TableField.class).value();
                 supplierQueryWrapper="asc".equals(supplierPagination.getSort().toLowerCase())?supplierQueryWrapper.orderByAsc(value):supplierQueryWrapper.orderByDesc(value);
@@ -117,12 +135,12 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
         }
     }
     @Override
-    public List<SupplierMobileEntity> getTypeList(SupplierPagination supplierPagination, String dataType){
+    public List<SupplierEntity> getTypeList(SupplierPagination supplierPagination,String dataType){
         String userId=userProvider.get().getUserId();
         List<String> AllIdList =new ArrayList();
 		int total=0;
 		int supplierNum =0;
-        QueryWrapper<SupplierMobileEntity> supplierQueryWrapper=new QueryWrapper<>();
+        QueryWrapper<SupplierEntity> supplierQueryWrapper=new QueryWrapper<>();
     boolean pcPermission = false;
     boolean appPermission = false;
     boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@@ -132,7 +150,7 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
             if (ObjectUtil.isEmpty(supplierObj)){
                 return new ArrayList<>();
             } else {
-                supplierQueryWrapper = (QueryWrapper<SupplierMobileEntity>)supplierObj;
+                supplierQueryWrapper = (QueryWrapper<SupplierEntity>)supplierObj;
                 supplierNum++;
             }
         }
@@ -143,7 +161,7 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
             if (ObjectUtil.isEmpty(supplierObj)){
                 return new ArrayList<>();
             } else {
-            supplierQueryWrapper = (QueryWrapper<SupplierMobileEntity>)supplierObj;
+            supplierQueryWrapper = (QueryWrapper<SupplierEntity>)supplierObj;
              supplierNum++;
 			}
 
@@ -152,25 +170,40 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
     }
 			if(StringUtil.isNotEmpty(supplierPagination.getSupplierCode())){
             supplierNum++;
-            supplierQueryWrapper.lambda().like(SupplierMobileEntity::getSupplierCode,supplierPagination.getSupplierCode());
+            supplierQueryWrapper.lambda().like(SupplierEntity::getSupplierCode,supplierPagination.getSupplierCode());
                     }
 
 			if(StringUtil.isNotEmpty(supplierPagination.getSupplierName())){
             supplierNum++;
-            supplierQueryWrapper.lambda().like(SupplierMobileEntity::getSupplierName,supplierPagination.getSupplierName());
+            supplierQueryWrapper.lambda().like(SupplierEntity::getSupplierName,supplierPagination.getSupplierName());
+                    }
+
+			if(StringUtil.isNotEmpty(supplierPagination.getContactName())){
+            supplierNum++;
+            supplierQueryWrapper.lambda().like(SupplierEntity::getContactName,supplierPagination.getContactName());
+                    }
+
+			if(StringUtil.isNotEmpty(supplierPagination.getContactPhone())){
+            supplierNum++;
+            supplierQueryWrapper.lambda().like(SupplierEntity::getContactPhone,supplierPagination.getContactPhone());
+                    }
+
+			if(StringUtil.isNotEmpty(supplierPagination.getSupplierSiteCode())){
+            supplierNum++;
+            supplierQueryWrapper.lambda().like(SupplierEntity::getSupplierSiteCode,supplierPagination.getSupplierSiteCode());
                     }
 
 		if(AllIdList.size()>0){
-        supplierQueryWrapper.lambda().in(SupplierMobileEntity::getId, AllIdList);
+        supplierQueryWrapper.lambda().in(SupplierEntity::getId, AllIdList);
 				}
         //排序
         if(StringUtil.isEmpty(supplierPagination.getSidx())){
-        supplierQueryWrapper.lambda().orderByDesc(SupplierMobileEntity::getSupplierCode);
+        supplierQueryWrapper.lambda().orderByDesc(SupplierEntity::getCreatorTime);
         }else{
             try {
             	String sidx = supplierPagination.getSidx();
-                SupplierMobileEntity supplierMobileEntity = new SupplierMobileEntity();
-				Field declaredField = supplierMobileEntity.getClass().getDeclaredField(sidx);
+                SupplierEntity supplierEntity = new SupplierEntity();
+				Field declaredField = supplierEntity.getClass().getDeclaredField(sidx);
 				declaredField.setAccessible(true);
 				String value = declaredField.getAnnotation(TableField.class).value();
                  supplierQueryWrapper="asc".equals(supplierPagination.getSort().toLowerCase())?supplierQueryWrapper.orderByAsc(value):supplierQueryWrapper.orderByDesc(value);
@@ -180,11 +213,11 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
         }
         if("0".equals(dataType)){
             if((total>0 && AllIdList.size()>0) || total==0){
-                Page<SupplierMobileEntity> page=new Page<>(supplierPagination.getCurrentPage(), supplierPagination.getPageSize());
-                IPage<SupplierMobileEntity> userIPage=this.page(page, supplierQueryWrapper);
+                Page<SupplierEntity> page=new Page<>(supplierPagination.getCurrentPage(), supplierPagination.getPageSize());
+                IPage<SupplierEntity> userIPage=this.page(page, supplierQueryWrapper);
                 return supplierPagination.setData(userIPage.getRecords(),userIPage.getTotal());
             }else{
-                List<SupplierMobileEntity> list = new ArrayList();
+                List<SupplierEntity> list = new ArrayList();
                 return supplierPagination.setData(list, list.size());
             }
         }else{
@@ -193,24 +226,30 @@ public class SupplierMobileServiceImpl extends ServiceImpl<SupplierMobileMapper,
     }
 
     @Override
-    public SupplierMobileEntity getInfo(String id){
-        QueryWrapper<SupplierMobileEntity> queryWrapper=new QueryWrapper<>();
-        queryWrapper.lambda().eq(SupplierMobileEntity::getId,id);
+    public SupplierEntity getInfo(String id){
+        QueryWrapper<SupplierEntity> queryWrapper=new QueryWrapper<>();
+        queryWrapper.lambda().eq(SupplierEntity::getId,id);
         return this.getOne(queryWrapper);
     }
 
     @Override
-    public void create(SupplierMobileEntity entity){
+    public void create(SupplierEntity entity){
         this.save(entity);
     }
 
     @Override
-    public boolean update(String id, SupplierMobileEntity entity){
+    public boolean update(String id, SupplierEntity entity){
         entity.setId(id);
         return this.updateById(entity);
     }
+
+    @Override
+    public IPage<SupplierMobileEntity> page(Page<SupplierMobileEntity> page, Wrapper<SupplierEntity> queryWrapper) {
+        return supplierMapper.getSupplierList(page,queryWrapper);
+    }
+
     @Override
-    public void delete(SupplierMobileEntity entity){
+    public void delete(SupplierEntity entity){
         if(entity!=null){
             this.removeById(entity.getId());
         }

SC-boot/linkage-scm/src/main/resources/mapper/customer/CustomerVMapper.xml

@@ -36,7 +36,6 @@
                     a.enterprise,
                     a.classification,
                     a.country,
-                    a.city,
                     IFNULL( SUM( b.gross_weight ), 0.0000000000 ) settlemenSum,
                     IFNULL( SUM( b.net_weight ), 0.0000000000 ) weightSum,
                     IFNULL( SUM( b.buckle_weight ), 0.0000000000 ) buckleWeightSum,
@@ -85,7 +84,6 @@
         <result column="enterprise" property="enterprise"/>
         <result column="classification" property="classification"/>
         <result column="country" property="country"/>
-        <result column="city" property="city"/>
 
         <result column="settlemenSum" property="settlemenSum"/>
         <result column="weightSum" property="weightSum"/>

SC-boot/linkage-scm/src/main/resources/mapper/monitorItem/Monitoring_itemMapper.xml

@@ -2,5 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="jnpf.monitoringitem.mapper.MonitoringitemMapper">
 
+    <select id="getMonitorItemList" resultMap="getMonitorItemListTree" >
+        select a.m_name,b.* from jg_monitoring a LEFT JOIN jg_monitoring_item0 b on a.id= b.monitoring_id  where  ISNULL(b.isEnable) or b.isEnable='1'
+    </select>
+
+
+    <resultMap id="getMonitorItemListTree" type="map">
+<!--        区域名称-->
+        <result column="m_name" property="name" ></result>
+
+        <collection property="videoStreaming" ofType="map" javaType="list">
+<!--            摄像头名字-->
+            <result property="mName" column="m_name"></result>
+<!--            设备序列号-->
+            <result property="serialnumber" column="serialnumber"></result>
+<!--            fiv视频流地址-->
+            <result property="flvAddress" column="flvAddress"></result>
+<!--         flv高清视频流地址   -->
+            <result property="flvHdAddress" column="flvHdAddress"></result>
+<!--       通道号     -->
+            <result property="channelNumber" column="channelNumber"></result>
+<!--       设备状态     -->
+            <result property="mStatus" column="m_status"></result>
+        </collection>
+    </resultMap>
 
 </mapper>

SC-boot/linkage-scm/src/main/resources/mapper/supplier/SupplierinvoicesMapper.xml

@@ -1,6 +1,6 @@
 <?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="jnpf.supplier.mapper.SupplierMobileMapper">
+<mapper namespace="jnpf.supplier.mapper.SupplierMapper">
     <select id="getSupplierList" resultMap="supplierMap">
         SELECT
             *
@@ -23,7 +23,6 @@
                     a.supplier_site_id,
                     a.supplier_site_code,
                     a.company_id,
-                    a.company_name,
                     a.vat_registration_num,
                     a.orgnize_id,
                     a.department_id,
@@ -33,6 +32,17 @@
                     a.supplier_level,
                     a.address,
                     a.`status`,
+                    a.country,
+                    a.province,
+                    a.classification,
+                    a.enterprise,
+                    a.bank,
+                    a.bank_account,
+                    a.tax_code,
+                    a.payable,
+                    a.prepaid,
+                    a.is_purchase,
+                    a.is_payment,
                     IFNULL( SUM( b.gross_weight ), 0.0000000000 ) settlemenSum,
                     IFNULL( SUM( b.net_weight ), 0.0000000000 ) weightSum,
                     IFNULL( SUM( b.buckle_weight ), 0.0000000000 ) buckleWeightSum,
@@ -51,24 +61,24 @@
 
     <resultMap id="supplierMap" type="jnpf.supplier.entity.SupplierMobileEntity">
         <result column="id" property="id"/>
-        <result column="creator_user_id" property="creatoruserid"/>
-        <result column="creator_user_name" property="creatorusername"/>
-        <result column="creator_time" property="creatortime"/>
-        <result column="last_modify_user_id" property="lastmodifyuserid"/>
-        <result column="last_modify_user_name" property="lastmodifyusername"/>
-        <result column="last_modify_time" property="lastmodifytime"/>
-        <result column="delete_user_id" property="deleteuserid"/>
-        <result column="delete_user_name" property="deleteusername"/>
-        <result column="delete_time" property="deletetime"/>
-        <result column="delete_mark" property="deletemark"/>
+        <result column="creator_user_id" property="creatorUserId"/>
+        <result column="creator_user_name" property="creatorUserName"/>
+        <result column="creator_time" property="creatorTime"/>
+        <result column="last_modify_user_id" property="lastModifyUserId"/>
+        <result column="last_modify_user_name" property="lastModifyUserName"/>
+        <result column="last_modify_time" property="lastModifyTime"/>
+        <result column="delete_user_id" property="deleteUserId"/>
+        <result column="delete_user_name" property="deleteUserName"/>
+        <result column="delete_time" property="deleteTime"/>
+        <result column="delete_mark" property="deleteMark"/>
         <result column="supplier_code" property="supplierCode"/>
         <result column="supplier_name" property="supplierName"/>
         <result column="supplier_site_id" property="supplierSiteCode"/>
         <result column="supplier_site_code" property="supplierSiteCode"/>
         <result column="company_id" property="companyId"/>
-        <result column="company_name" property="companyName"/>
+
         <result column="vat_registration_num" property="vatRegistrationNum"/>
-        <result column="orgnize_id" property="orgId"/>
+        <result column="orgnize_id" property="orgnizeId"/>
         <result column="department_id" property="departmentId"/>
         <result column="supply" property="supply"/>
         <result column="contact_name" property="contactName"/>
@@ -76,6 +86,17 @@
         <result column="supplier_level" property="supplierLevel"/>
         <result column="address" property="address"/>
         <result column="status" property="status"/>
+        <result column="country" property="country"/>
+        <result column="province" property="province"/>
+        <result column="classification" property="classification"/>
+        <result column="enterprise" property="enterprise"/>
+        <result column="bank" property="bank"/>
+        <result column="bank_account" property="bankAccount"/>
+        <result column="tax_code" property="taxCode"/>
+        <result column="payable" property="payable"/>
+        <result column="prepaid" property="prepaid"/>
+        <result column="is_purchase" property="isPurchase"/>
+        <result column="is_payment" property="isPayment"/>
         <result column="settlemenSum" property="settlemenSum"/>
         <result column="weightSum" property="weightSum"/>
         <result column="buckleWeightSum" property="buckleWeightSum"/>

SC-web/src/views/scm/basicInformation/arinvoices/index.vue

@@ -26,6 +26,17 @@
                                     </el-button>
                                     <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
                                     </el-button>
+                      <el-button type="text" icon="el-icon-plus"  @click="1">编辑
+                      </el-button>
+                      <el-button type="text" icon="el-icon-plus"  @click="1">删除
+                      </el-button>
+                      <el-button type="text" icon="el-icon-plus"  @click="1">审核
+                      </el-button>
+                      <el-button type="text" icon="el-icon-plus"  @click="1">弃审
+                      </el-button>
+                      <el-button type="text" icon="el-icon-plus"  @click="1">提交
+                      </el-button>
+
                     </div>
                     <div class="JNPF-common-head-right">
                         <el-tooltip effect="dark" content="刷新" placement="top">
@@ -35,36 +46,37 @@
                         <screenfull isContainer/>
                     </div>
                 </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="documentNo" label="单据编号" width="0" align="left"
+                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false" @selection-change="handleSelectionChange" border>
+                  <el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
+                            <el-table-column prop="documentNo" label="单据编号" sortable width="200" align="center"  fixed="left"
 />
-                            <el-table-column prop="customerName" label="客户名称" width="0" align="left"
+                            <el-table-column prop="customerName" label="客户名称" sortable width="150" align="center" fixed="left"
 />
-                            <el-table-column prop="amount" label="金额" width="0" align="left"
+                            <el-table-column prop="amount" label="金额" width="120" sortable align="center"
 />
-                            <el-table-column prop="quantity" label="数量" width="0" align="left"
+                            <el-table-column prop="quantity" label="数量" width="120" sortable align="center"
 />
-                                <el-table-column label="币别 " width="0" prop="currency" algin="left"
+                                <el-table-column label="币别 " width="80" prop="currency" sortable algin="center"
 >
                                     <template slot-scope="scope">
                                         {{ scope.row.currency | dynamicText(currencyOptions) }}
                                     </template>
                                 </el-table-column>
-                            <el-table-column prop="invoiceAmount" label="发票金额" width="0" align="left"
+                            <el-table-column prop="invoiceAmount" label="发票金额" sortable width="120" align="center"
 />
-                            <el-table-column prop="invoiceQuantity" label="发票数量" width="0" align="left"
+                            <el-table-column prop="invoiceQuantity" label="发票数量" sortable width="120" align="center"
 />
-                            <el-table-column prop="salesOrderNo" label="销售订单号" width="0" align="left"
+                            <el-table-column prop="salesOrderNo" label="销售订单号" sortable width="200" align="center"
 />
-                            <el-table-column prop="contractName" label="合同名称" width="0" align="left"
+                            <el-table-column prop="contractName" label="合同名称" sortable width="200" align="center"
 />
-                                <el-table-column label="单据状态 " width="0" prop="status" algin="left"
+                                <el-table-column label="单据状态 " width="120" sortable prop="status" algin="center"
 >
                                     <template slot-scope="scope">
                                         {{ scope.row.status | dynamicText(statusOptions) }}
                                     </template>
                                 </el-table-column>
-                            <el-table-column prop="creatorUserName" label="制单人" width="0" align="left"
+                            <el-table-column prop="creatorUserName" label="制单人" width="120" sortable align="center"
 />
                         <el-table-column label="操作" fixed="right"
 width="150" >

SC-web/src/views/scm/basicInformation/collection/Form.vue

@@ -1,4 +1,5 @@
 <template>
+<<<<<<< HEAD
 <el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
            :close-on-click-modal="false" append-to-body
            :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
@@ -11,102 +12,98 @@
  prop="documentNo" >
                     <el-input    v-model="dataForm.documentNo"
  placeholder="系统自动生成"  readonly>
+=======
+  <el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
+    :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1500px">
+    <el-row :gutter="15" class="">
+      <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
+        <template v-if="!loading">
+          <el-col :span="8">
+            <el-form-item label="单据编号" prop="documentNo">
+              <el-input v-model="dataForm.documentNo" placeholder="系统自动生成" readonly>
+>>>>>>> ddaf1c11476266e400901543653df705c0f58f87
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="客户名称"
- prop="customerName" >
-                  <popupSelect    v-model="dataForm.customerName"
-                                  placeholder="请选择"  clearable  field="customerName" interfaceId="393371066040385285" :columnOptions="customerNamecolumnOptions" propsValue="supplier_nm" relationField="supplier_nm" popupType="dialog"
-                                  popupTitle="选择数据"  popupWidth="800px" @change="popupSelect"
-                  >
+          <el-col :span="8">
+            <el-form-item label="客户名称" prop="customerName">
+              <popupSelect v-model="dataForm.customerName" placeholder="请选择" clearable field="customerName"
+                interfaceId="393371066040385285" :columnOptions="customerNamecolumnOptions" propsValue="supplier_nm"
+                relationField="supplier_nm" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
+                @change="popupSelect">
               </popupSelect>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="收款金额"
- prop="amountCollected" >
-                    <el-input    v-model="dataForm.amountCollected"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+          <el-col :span="8">
+            <el-form-item label="收款金额" prop="amountCollected">
+              <el-input v-model="dataForm.amountCollected" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="收款账户"
- prop="collectionCount" >
-                    <el-input    v-model="dataForm.collectionCount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+          <el-col :span="8">
+            <el-form-item label="收款账户" prop="collectionCount">
+              <el-input v-model="dataForm.collectionCount" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="收款银行"
- prop="collectionBank" >
-                    <el-input    v-model="dataForm.collectionBank"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+          <el-col :span="8">
+            <el-form-item label="收款银行" prop="collectionBank">
+              <el-input v-model="dataForm.collectionBank" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="收款类型 "
- prop="paymentType" >
-                    <el-select    v-model="dataForm.paymentType"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in paymentTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+          <el-col :span="8">
+            <el-form-item label="收款类型 " prop="paymentType">
+              <el-select v-model="dataForm.paymentType" placeholder="请选择" clearable :style='{"width":"100%"}'>
+                <el-option v-for="(item, index) in paymentTypeOptions" :key="index" :label="item.fullName"
+                  :value="item.id" :disabled="item.disabled"></el-option>
 
               </el-select>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="币别 "
- prop="currency" >
-                    <el-select    v-model="dataForm.currency"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+          <el-col :span="8">
+            <el-form-item label="币别 " prop="currency">
+              <el-select v-model="dataForm.currency" placeholder="请选择" clearable :style='{"width":"100%"}'>
+                <el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id"
+                  :disabled="item.disabled"></el-option>
 
               </el-select>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="结算类型"
- prop="settlementType" >
-                    <el-select    v-model="dataForm.settlementType"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in settlementTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+          <el-col :span="8">
+            <el-form-item label="结算类型" prop="settlementType">
+              <el-select v-model="dataForm.settlementType" placeholder="请选择" clearable :style='{"width":"100%"}'>
+                <el-option v-for="(item, index) in settlementTypeOptions" :key="index" :label="item.fullName"
+                  :value="item.id" :disabled="item.disabled"></el-option>
 
               </el-select>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="备注信息"
- prop="remark" >
-                    <el-input    v-model="dataForm.remark"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+          <el-col :span="8">
+            <el-form-item label="备注信息" prop="remark">
+              <el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="收款凭证"
- prop="voucher" >
-                    <JNPF-UploadFz    v-model="dataForm.voucher"
- :fileSize="5"    sizeUnit="MB"  :limit="9"  buttonText="点击上传" >
+          <el-col :span="8">
+            <el-form-item label="收款凭证" prop="voucher">
+              <JNPF-UploadFz v-model="dataForm.voucher" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传">
 
               </JNPF-UploadFz>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="单据状态 "
- prop="status" >
-                    <el-select    v-model="dataForm.status"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+          <el-col :span="8">
+            <el-form-item label="单据状态 " prop="status">
+              <el-select v-model="dataForm.status" placeholder="请选择" clearable :style='{"width":"100%"}'>
+                <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id"
+                  :disabled="item.disabled"></el-option>
 
+<<<<<<< HEAD
                 </el-select>
                 </el-form-item>
             </el-col>
@@ -222,9 +219,121 @@
     </el-col>
             </el-tab-pane >
             </el-tabs>
+=======
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="制单人" prop="creatorUserName">
+              <el-input v-model="dataForm.creatorUserName" placeholder="请输入" clearable :style='{"width":"100%"}'>
+
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-tabs v-model="activeojnisi" tab-position="top" class="mb-20">
+              <el-tab-pane label="收款明细">
+                <el-col :span="24">
+                  <el-form-item label-width="0">
+                    <div class="JNPF-common-title">
+                      <h2></h2>
+                    </div>
+                    <el-table :data="dataForm.collection_item0List" size='mini' show-summary>
+                      <el-table-column type="index" width="50" label="序号" align="center" />
+                      <el-table-column prop="amount" label="收款金额" align="center" >
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.amount" placeholder="请输入" clearable :style='{"width":"100%"}'>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="creatorUserId" label="订单金额" align="center" >
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.price" placeholder="请输入" clearable :style='{"width":"100%"}'>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="creatorUserName" label="已收款金额" align="center" >
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.amountCollected" placeholder="请输入" clearable
+                            :style='{"width":"100%"}'>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="deleteTime" label="销售订单编号" align="center" >
+                        <template slot-scope="scope">
+                          <popupSelect v-model="scope.row.documentNo" placeholder="请选择" clearable
+                            :field="'deleteTime'+scope.$index" interfaceId="393372436705378053"
+                            :columnOptions="jg_collection_item0deleteTimecolumnOptions" propsValue="document_no"
+                            relationField="document_no" popupType="dialog" popupWidth="800px"
+                            :bissId="dataForm.customerCode" @change="popupSelect2">
+                          </popupSelect>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="lastModifyUserId" label="合同编号" align="center" >
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.contractCode" placeholder="请输入" clearable
+                            :style='{"width":"100%"}'>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="lastModifyUserName" label="数量" align="center" >
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.num" placeholder="请输入" clearable :style='{"width":"100%"}'>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <!--            <el-table-column prop="taxRate" label="税率">-->
+                      <!--                <template slot-scope="scope">-->
+                      <!--                    <el-select   v-model="scope.row.taxRate"-->
+                      <!-- placeholder="请选择"  clearable  :style='{"width":"100%"}'>-->
+                      <!--                            <el-option v-for="(item, index) in taxRateOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>-->
+                      <!--                </el-select>-->
+                      <!--            </template>-->
+                      <!--        </el-table-column>-->
+                      <el-table-column prop="lastModifyTime" label="垫资金额" align="center" >
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.advanceAmount" placeholder="请输入" clearable
+                            :style='{"width":"100%"}'>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="deleteUserId" label="税额" align="center" >
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.rate" placeholder="请输入" clearable :style='{"width":"100%"}'>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="deleteUserName" label="不含税金额" align="center" >
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.notPrice" placeholder="请输入" clearable :style='{"width":"100%"}'>
+                          </el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column prop="creatorTime" label="业务日期" align="center" >
+                        <template slot-scope="scope">
+                          <el-date-picker v-model="scope.row.creatorTime" placeholder="请选择" clearable
+                            :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp">
+                          </el-date-picker>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="操作" width="50">
+                        <template slot-scope="scope">
+                          <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                            @click="delcollection_item0List(scope.$index)">删除</el-button>
+                        </template>
+                      </el-table-column>
+                    </el-table>
+                    <div class="table-actions" @click="addcollection_item0List()">
+                      <el-button type="text" icon="el-icon-plus">添加</el-button>
+                    </div>
+                  </el-form-item>
+>>>>>>> ddaf1c11476266e400901543653df705c0f58f87
+                </el-col>
+              </el-tab-pane>
+            </el-tabs>
           </el-col>
         </template>
-</el-form>
+      </el-form>
     </el-row>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false"> 取 消</el-button>
@@ -233,6 +342,7 @@
   </el-dialog>
 </template>
 <script>
+<<<<<<< HEAD
     import request from '@/utils/request'
     import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
     import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
@@ -274,12 +384,189 @@
                         currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
                         settlementTypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
                         statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"},{"fullName":"已付款","id":"3"}],
+=======
+  import request from '@/utils/request'
+  import {
+    getDataInterfaceRes
+  } from '@/api/systemData/dataInterface'
+  import {
+    getDictionaryDataSelector
+  } from '@/api/systemData/dictionary'
+  export default {
+    components: {},
+    props: [],
+    data() {
+      return {
+        visible: false,
+        loading: false,
+        isDetail: false,
+        dataForm: {
+          customerCode: '',
+          documentNo: '',
+          customerName: '',
+          amountCollected: '',
+          collectionCount: '',
+          collectionBank: '',
+          paymentType: "0",
+          currency: "0",
+          settlementType: "0",
+          remark: '',
+          voucher: [],
+          status: "0",
+          creatorUserName: '',
+          collection_item0List: [],
+        },
+        activeojnisi: '0',
+        rules: {},
+        customerNamecolumnOptions: [{
+          "label": "客户编码",
+          "value": "supplier_cd"
+        }, {
+          "label": "客户名称",
+          "value": "supplier_nm"
+        }, {
+          "label": "客户地点名称",
+          "value": "supplier_site_code"
+        }, {
+          "label": "客户等级",
+          "value": "customer_level"
+        }, ],
+        jg_collection_item0deleteTimecolumnOptions: [{
+            "label": "销售订单ID",
+            "value": "id"
+          }, {
+            "label": "销售订单编号",
+            "value": "document_no"
+          }, {
+            "label": "合同编号",
+            "value": "contract_code"
+          },
+          {
+            "label": "订单金额",
+            "value": "price"
+          }, {
+            "label": "已收款金额",
+            "value": "amount_collected"
+          },
+          {
+            "label": "重量",
+            "value": "num"
+          }, {
+            "label": "垫资金额",
+            "value": "advance_amount"
+          },
+          {
+            "label": "税额",
+            "value": "rate"
+          }, {
+            "label": "不含税金额",
+            "value": "not_price"
+          }, {
+            "label": "业务日期",
+            "value": "creator_time"
+          },
+        ],
+        paymentTypeOptions: [{
+          "fullName": "货款",
+          "id": "0"
+        }, {
+          "fullName": "运费",
+          "id": "1"
+        }, {
+          "fullName": "仓储",
+          "id": "2"
+        }],
+        currencyOptions: [{
+          "fullName": "人民币",
+          "id": "0"
+        }, {
+          "fullName": "美元",
+          "id": "1"
+        }, {
+          "fullName": "英镑",
+          "id": "2"
+        }],
+        settlementTypeOptions: [{
+          "fullName": "现金",
+          "id": "0"
+        }, {
+          "fullName": "赊购",
+          "id": "1"
+        }, {
+          "fullName": "网银",
+          "id": "2"
+        }, {
+          "fullName": "银企直连",
+          "id": "3"
+        }, {
+          "fullName": "银票",
+          "id": "4"
+        }, {
+          "fullName": "商票",
+          "id": "5"
+        }],
+        statusOptions: [{
+          "fullName": "已保存",
+          "id": "0"
+        }, {
+          "fullName": "审批中",
+          "id": "1"
+        }, {
+          "fullName": "已审批",
+          "id": "2"
+        }, {
+          "fullName": "已付款",
+          "id": "3"
+        }],
+>>>>>>> ddaf1c11476266e400901543653df705c0f58f87
 
-                        taxRateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
+        taxRateOptions: [{
+          "fullName": "13",
+          "id": "0"
+        }, {
+          "fullName": "9",
+          "id": "1"
+        }, {
+          "fullName": "6",
+          "id": "2"
+        }, {
+          "fullName": "5",
+          "id": "3"
+        }, {
+          "fullName": "3",
+          "id": "4"
+        }, {
+          "fullName": "0",
+          "id": "5"
+        }],
       }
     },
     computed: {},
     watch: {},
+    created() {},
+    mounted() {},
+    methods: {
+      popupSelect(e, d) {
+        this.dataForm.customerCode = d.id;
+      },
+      popupSelect2(a, b) {
+        for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {
+          if (a == this.dataForm.collection_item0List[i].documentNo) {
+            this.dataForm.collection_item0List[i].id = b.id;
+            this.dataForm.collection_item0List[i].price = b.price;
+            this.dataForm.collection_item0List[i].amountCollected = b.amount_collected;
+            this.dataForm.collection_item0List[i].contractCode = b.contract_code;
+            this.dataForm.collection_item0List[i].num = b.num;
+            this.dataForm.collection_item0List[i].advanceAmount = b.advance_amount;
+            this.dataForm.collection_item0List[i].rate = b.rate;
+            this.dataForm.collection_item0List[i].notPrice = b.not_price;
+            this.dataForm.collection_item0List[i].creatorTime = b.creator_time;
+          }
+        }
+<<<<<<< HEAD
+        },
+        computed: {},
+        watch: {},
         created() {
         },
         mounted() {},
@@ -454,4 +741,128 @@
         },
     }
 
+=======
+      },
+      collection_item0Exist() {
+        let isOk = true;
+        for (let i = 0; i < this.dataForm.collection_item0List.length; i++) {
+          const e = this.dataForm.collection_item0List[i];
+        }
+        return isOk;
+      },
+      clearData(data) {
+        for (let key in data) {
+          if (data[key] instanceof Array) {
+            data[key] = [];
+          } else if (data[key] instanceof Object) {
+            this.clearData(data[key]);
+          } else {
+            data[key] = "";
+          }
+        }
+      },
+      init(id, isDetail) {
+        this.dataForm.id = id || 0;
+        this.visible = true;
+        this.isDetail = isDetail || false;
+        this.$nextTick(() => {
+          this.$refs['elForm'].resetFields();
+          if (this.dataForm.id) {
+            this.loading = true
+            request({
+              url: '/api/collection/Collection/' + this.dataForm.id,
+              method: 'get'
+            }).then(res => {
+              this.dataInfo(res.data)
+              this.loading = false
+            });
+          } else {
+            this.clearData(this.dataForm)
+          }
+        });
+        this.$store.commit('generator/UPDATE_RELATION_DATA', {})
+      },
+      // 表单提交
+      dataFormSubmit() {
+        this.$refs['elForm'].validate((valid) => {
+          if (valid) {
+            if (!this.collection_item0Exist()) return
+            this.request()
+          }
+        })
+      },
+      request() {
+        var _data = this.dataList()
+        if (!this.dataForm.id) {
+          request({
+            url: '/api/collection/Collection',
+            method: 'post',
+            data: _data
+          }).then((res) => {
+            this.$message({
+              message: res.msg,
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refresh', true)
+              }
+            })
+          })
+        } else {
+          request({
+            url: '/api/collection/Collection/' + this.dataForm.id,
+            method: 'PUT',
+            data: _data
+          }).then((res) => {
+            this.$message({
+              message: res.msg,
+              type: 'success',
+              duration: 1000,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refresh', true)
+              }
+            })
+          })
+        }
+      },
+      addcollection_item0List() {
+        let item = {
+          amount: undefined,
+          creatorUserId: undefined,
+          creatorUserName: undefined,
+          deleteTime: undefined,
+          lastModifyUserId: undefined,
+          lastModifyUserName: undefined,
+          taxRate: undefined,
+          lastModifyTime: undefined,
+          deleteUserId: undefined,
+          deleteUserName: undefined,
+          creatorTime: undefined,
+        }
+        this.dataForm.collection_item0List.push(item)
+      },
+      delcollection_item0List(index) {
+        this.dataForm.collection_item0List.splice(index, 1);
+      },
+      dataList() {
+        var _data = JSON.parse(JSON.stringify(this.dataForm));
+        _data.voucher = JSON.stringify(_data.voucher)
+        for (let i = 0; i < _data.collection_item0List.length; i++) {
+          var _list = _data.collection_item0List[i];
+        }
+        return _data;
+      },
+      dataInfo(dataAll) {
+        let _dataAll = dataAll
+        _dataAll.voucher = JSON.parse(_dataAll.voucher)
+        for (let i = 0; i < _dataAll.collection_item0List.length; i++) {
+          var _list = _dataAll.collection_item0List[i];
+        }
+        this.dataForm = _dataAll
+      },
+    },
+  }
+>>>>>>> ddaf1c11476266e400901543653df705c0f58f87
 </script>

SC-web/src/views/scm/basicInformation/collection/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="JNPF-common-layout">
 
+<<<<<<< HEAD
         <div class="JNPF-common-layout-center">
             <el-row class="JNPF-common-search-box" :gutter="16">
                 <el-form @submit.native.prevent>
@@ -90,28 +91,122 @@
                 </JNPF-table>
                     <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
             </div>
+=======
+    <div class="JNPF-common-layout-center">
+      <el-row class="JNPF-common-search-box" :gutter="16">
+        <el-form @submit.native.prevent>
+          <el-col :span="6">
+            <el-form-item label="单据编号">
+              <el-input v-model="query.documentNo" placeholder="请输入" clearable> </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+              <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="JNPF-common-layout-main JNPF-flex-main">
+        <div class="JNPF-common-head">
+          <div>
+            <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            </el-button>
+            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            </el-button>
+            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            </el-button>
+            <el-button type="text" icon="el-icon-check" @click="exportData()">审核
+            </el-button>
+            <el-button type="text" icon="el-icon-close" @click="exportData()">弃审
+            </el-button>
+            <el-button type="text" icon="el-icon-check" @click="exportData()">提交
+            </el-button>
+            <el-button type="text" icon="el-icon-check" @click="confirmprice()">认款
+            </el-button>
+          </div>
+          <div class="JNPF-common-head-right">
+            <el-tooltip effect="dark" content="刷新" placement="top">
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="reset()" />
+            </el-tooltip>
+            <screenfull isContainer />
           </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+>>>>>>> ddaf1c11476266e400901543653df705c0f58f87
+        </div>
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
+          @selection-change="handleSelectionChange" border>
+          <el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
+          <el-table-column prop="documentNo" label="单据编号" fixed="left" sortable width="200" align="center" />
+          <el-table-column prop="customerName" label="客户名称" fixed="left" sortable width="200" align="center" />
+          <el-table-column label="币别 " width="80" sortable prop="currency" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.currency | dynamicText(currencyOptions) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="amountCollected" sortable label="收款金额" width="150" align="center" />
+          <el-table-column prop="collectionCount" sortable label="收款账户" width="150" align="center" />
+          <el-table-column prop="collectionBank" sortable label="收款银行" width="150" align="center" />
+          <el-table-column label="收款类型" sortable width="150" prop="paymentType" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.paymentType | dynamicText(paymentTypeOptions) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="结算类型" sortable width="150" prop="settlementType" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.settlementType | dynamicText(settlementTypeOptions) }}
+            </template>
+          </el-table-column>
+          <el-table-column label="单据状态" sortable width="150" prop="status" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.status | dynamicText(statusOptions) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="creatorUserName" sortable label="制单人" width="150" align="center" />
+          <el-table-column label="操作" fixed="right" width="150">
+            <template slot-scope="scope">
+              <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+              </el-button>
+              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              </el-button>
+              <el-button type="text" @click="goDetail(scope.row.id)">详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </JNPF-table>
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+          @pagination="initData" />
+      </div>
+    </div>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
   </div>
 </template>
 
 <script>
   import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
+  import {
+    getDictionaryDataSelector
+  } from '@/api/systemData/dictionary'
   import JNPFForm from './Form'
   import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
+  import {
+    getDataInterfaceRes
+  } from '@/api/systemData/dataInterface'
   import Detail from './Detail'
 
   export default {
-        components: {JNPFForm, ExportBox,Detail},
+    components: {
+      JNPFForm,
+      ExportBox,
+      Detail
+    },
     data() {
       return {
         detailVisible: false,
         query: {
-                                documentNo:undefined,
+          documentNo: undefined,
         },
         treeProps: {
           children: 'children',
@@ -120,7 +215,8 @@
         },
         list: [],
         listLoading: true,
- multipleSelection: [],                    total: 0,
+        multipleSelection: [],
+        total: 0,
         listQuery: {
           currentPage: 1,
           pageSize: 20,
@@ -129,26 +225,115 @@
         },
         formVisible: false,
         exportBoxVisible: false,
-                columnList: [
-                    {prop: 'documentNo', label: '单据编号'},
-                    {prop: 'customerName', label: '客户名称'},
-                    {prop: 'currency', label: '币别 '},
-                    {prop: 'amountCollected', label: '收款金额'},
-                    {prop: 'collectionCount', label: '收款账户'},
-                    {prop: 'collectionBank', label: '收款银行'},
-                    {prop: 'paymentType', label: '收款类型 '},
-                    {prop: 'settlementType', label: '结算类型'},
-                    {prop: 'status', label: '单据状态 '},
-                    {prop: 'creatorUserName', label: '制单人'},
+        columnList: [{
+            prop: 'documentNo',
+            label: '单据编号'
+          },
+          {
+            prop: 'customerName',
+            label: '客户名称'
+          },
+          {
+            prop: 'currency',
+            label: '币别 '
+          },
+          {
+            prop: 'amountCollected',
+            label: '收款金额'
+          },
+          {
+            prop: 'collectionCount',
+            label: '收款账户'
+          },
+          {
+            prop: 'collectionBank',
+            label: '收款银行'
+          },
+          {
+            prop: 'paymentType',
+            label: '收款类型 '
+          },
+          {
+            prop: 'settlementType',
+            label: '结算类型'
+          },
+          {
+            prop: 'status',
+            label: '单据状态 '
+          },
+          {
+            prop: 'creatorUserName',
+            label: '制单人'
+          },
         ],
-                                paymentTypeOptions:[{"fullName":"货款","id":"0"},{"fullName":"运费","id":"1"},{"fullName":"仓储","id":"2"}],
-                            paymentTypeProps:{"label":"fullName","value":"id"},
-                                currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
-                            currencyProps:{"label":"fullName","value":"id"},
-                                settlementTypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
-                            settlementTypeProps:{"label":"fullName","value":"id"},
-                                statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"},{"fullName":"已付款","id":"3"}],
-                            statusProps:{"label":"fullName","value":"id"},
+        paymentTypeOptions: [{
+          "fullName": "货款",
+          "id": "0"
+        }, {
+          "fullName": "运费",
+          "id": "1"
+        }, {
+          "fullName": "仓储",
+          "id": "2"
+        }],
+        paymentTypeProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        currencyOptions: [{
+          "fullName": "人民币",
+          "id": "0"
+        }, {
+          "fullName": "美元",
+          "id": "1"
+        }, {
+          "fullName": "英镑",
+          "id": "2"
+        }],
+        currencyProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        settlementTypeOptions: [{
+          "fullName": "现金",
+          "id": "0"
+        }, {
+          "fullName": "赊购",
+          "id": "1"
+        }, {
+          "fullName": "网银",
+          "id": "2"
+        }, {
+          "fullName": "银企直连",
+          "id": "3"
+        }, {
+          "fullName": "银票",
+          "id": "4"
+        }, {
+          "fullName": "商票",
+          "id": "5"
+        }],
+        settlementTypeProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        statusOptions: [{
+          "fullName": "已保存",
+          "id": "0"
+        }, {
+          "fullName": "审批中",
+          "id": "1"
+        }, {
+          "fullName": "已审批",
+          "id": "2"
+        }, {
+          "fullName": "已付款",
+          "id": "3"
+        }],
+        statusProps: {
+          "label": "fullName",
+          "value": "id"
+        },
       }
     },
     computed: {
@@ -160,13 +345,17 @@
       this.initData()
     },
     methods: {
-            goDetail(id){
+      goDetail(id) {
         this.detailVisible = true
         this.$nextTick(() => {
           this.$refs.Detail.init(id)
         })
       },
-            sortChange({column, prop, order}) {
+      sortChange({
+        column,
+        prop,
+        order
+      }) {
         this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
         this.listQuery.sidx = !order ? '' : prop
         this.initData()
@@ -176,15 +365,15 @@
         let _query = {
           ...this.listQuery,
           ...this.query,
-                    menuId:this.menuId
+          menuId: this.menuId
         };
         request({
           url: `/api/collection/Collection/getList`,
           method: 'post',
           data: _query
         }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
+          var _list = [];
+          for (let i = 0; i < res.data.list.length; i++) {
             let _data = res.data.list[i];
             _list.push(_data)
           }
@@ -210,8 +399,7 @@
               }
             });
           })
-                }).catch(() => {
-                });
+        }).catch(() => {});
       },
       handleSelectionChange(val) {
         const res = val.map(item => item.id)
@@ -242,10 +430,9 @@
               }
             });
           })
-                    }).catch(() => {
-                    })
+        }).catch(() => {})
       },
-            confirmprice(){
+      confirmprice() {
         if (!this.multipleSelection.length) {
           this.$message({
             type: 'error',
@@ -287,7 +474,12 @@
         })
       },
       download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
+        let query = {
+          ...data,
+          ...this.listQuery,
+          ...this.query,
+          menuId: this.menuId
+        }
         request({
           url: `/api/collection/Collection/Actions/Export`,
           method: 'GET',

SC-web/src/views/scm/basicInformation/payment/index.vue

@@ -44,6 +44,7 @@
         </div>
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
           @selection-change="handleSelectionChange" border>
+          <el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
           <el-table-column prop="paymentno" label="来源单号" fixed="left" sortable width="200" align="center"  />
           <el-table-column prop="documentno" label="单据编号" fixed="left" sortable width="200" align="center"  />
           <el-table-column prop="suppliername" label="供应商" fixed="left" sortable width="150" align="center"  />

SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue

@@ -10,21 +10,21 @@
             <el-form-item label="单据编号"
                           prop="documentNo">
               <el-input v-model="dataForm.documentNo"
-                        placeholder="系统自动生成" readonly>
+                        placeholder="系统自动生成" readonly  :disabled="true">
 
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="申请时间"
-                          prop="businessDate">
-              <el-date-picker v-model="dataForm.businessDate"
-                              placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime"
-                              format="yyyy-MM-dd HH:mm:ss" value-format="timestamp">
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="申请时间"-->
+<!--                          prop="businessDate">-->
+<!--              <el-date-picker v-model="dataForm.businessDate"-->
+<!--                              placeholder="请选择" clearable :style='{"width":"100%"}' type="datetime"-->
+<!--                              format="yyyy-MM-dd HH:mm:ss" value-format="timestamp">-->
 
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="8">
             <el-form-item label="供应商名称"
                           prop="supplierName">
@@ -33,7 +33,7 @@
                            :columnOptions="supplierNamecolumnOptions" propsValue="supplier_name"
                            relationField="supplier_name" popupType="dialog"
                            popupTitle="选择数据" popupWidth="800px"
-                           hasPage :pageSize="20"
+                           hasPage :pageSize="20"  @change="popupSelectourceNo">
               >
 
               </popupSelect>
@@ -54,7 +54,7 @@
             <el-form-item label="申请金额"
                           prop="ramount">
               <el-input v-model="dataForm.ramount"
-                        placeholder="请输入" readonly clearable :style='{"width":"100%"}'>
+                        placeholder="请输入" readonly clearable :style='{"width":"100%"}' @input="inputChange()" :disabled="true">
 
               </el-input>
             </el-form-item>
@@ -155,26 +155,26 @@
                     <div class="JNPF-common-title">
                       <h2></h2>
                     </div>
-                    <el-table :data="dataForm.paymentdoc_item0List" size='mini'>
+                    <el-table :data="dataForm.paymentdoc_item0List" size='mini'  >
                       <el-table-column type="index" width="50" label="序号" align="center"/>
                       <el-table-column prop="amount" label="申请金额">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.amount"
-                                    placeholder="请输入" clearable :style='{"width":"100%"}'>
+                                    placeholder="请输入" clearable  @input="inputChange()"  :style='{"width":"100%"}'>
                           </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="creatorUserId" label="订单金额">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.creatorUserId"
-                                    placeholder="请输入" clearable :style='{"width":"100%"}'>
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
                           </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="creatorUserName" label="已付金额">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.creatorUserName"
-                                    placeholder="请输入" clearable :style='{"width":"100%"}'>
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
                           </el-input>
                         </template>
                       </el-table-column>
@@ -182,7 +182,7 @@
                         <template slot-scope="scope">
                           <popupSelect v-model="scope.row.purchaseorderId"
                                        placeholder="请选择" clearable :field="'purchaseorderId'+scope.$index"
-                                       interfaceId="393348986343324485" :bissId="dataForm.supplierName"
+                                       interfaceId="393348986343324485" :bissId="dataForm.supplierName" :excludeFields="excludeFields"
                                        :columnOptions="paymentdoc_item0purchaseorderIdcolumnOptions" propsValue="id"
                                        relationField="document_no" popupType="dialog"
                                        popupWidth="800px" @change="popupSelectorder"
@@ -190,59 +190,59 @@
                           </popupSelect>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="lastModifyUserId" label="合同编号">
+                      <el-table-column prop="lastModifyUserId" label="合同编号" >
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.lastModifyUserId"
-                                    placeholder="请输入" clearable :style='{"width":"100%"}'>
+                                    placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
                           </el-input>
                         </template>
                       </el-table-column>
-                      <el-table-column prop="lastModifyUserName" label="重量">
+                      <el-table-column prop="lastModifyUserName" label="重量" >
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.lastModifyUserName"
-                                    placeholder="请输入" clearable :style='{"width":"100%"}'>
+                                    placeholder="请输入" clearable :style='{"width":"100%"}':disabled="true">
                           </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="deleteMark" label="税率(%)">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.deleteMark"
-                                    placeholder="请输入" clearable :style='{"width":"100%"}'>
+                                    placeholder="请输入" clearable :style='{"width":"100%"}':disabled="true">
                           </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="departmentId" label="垫资金额">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.departmentId"
-                                    placeholder="请输入" clearable :style='{"width":"100%"}'>
+                                    placeholder="请输入" clearable :style='{"width":"100%"}':disabled="true">
                           </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="orgnizeId" label="税额">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.orgnizeId"
-                                    placeholder="请输入" clearable :style='{"width":"100%"}'>
+                                    placeholder="请输入" clearable :style='{"width":"100%"}':disabled="true">
                           </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="deleteUserId" label="不含税金额">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.deleteUserId"
-                                    placeholder="请输入" clearable :style='{"width":"100%"}'>
+                                    placeholder="请输入" clearable :style='{"width":"100%"}':disabled="true">
                           </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="deleteUserName" label="业务类型">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.deleteUserName"
-                                    placeholder="请输入" clearable :style='{"width":"100%"}'>
+                                    placeholder="请输入" clearable :style='{"width":"100%"}':disabled="true">
                           </el-input>
                         </template>
                       </el-table-column>
                       <el-table-column prop="creatorTime" label="业务日期">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.creatorTime"
-                                    placeholder="请输入" clearable :style='{"width":"100%"}'>
+                                    placeholder="请输入" clearable :style='{"width":"100%"}':disabled="true">
                           </el-input>
                         </template>
                       </el-table-column>
@@ -277,10 +277,12 @@
   import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 
   export default {
+
     components: {},
     props: [],
     data() {
       return {
+        excludeFields: [],
         visible: false,
         loading: false,
         isDetail: false,
@@ -308,13 +310,21 @@
         activeshpeyb: '0',
         rules:
           {
-            collectionAccount: [
+            supplierName: [
               {
                 required: true,
-                message: '请输入',
+                message: '请输入供应商',
                 trigger: 'blur'
               }
             ],
+            dueDate: [
+              {
+                required: true,
+                message: '请输入应付日期',
+                trigger: 'blur'
+              }
+            ],
+
             amount: [{ required: true, message: '请输入', trigger: 'blur' }]
 
           },
@@ -355,8 +365,25 @@
     mounted() {
     },
     methods: {
+
+      inputChange(value){
+        var amount = 0;
+        for (let i = 0; i < this.dataForm.paymentdoc_item0List.length; i++) {
+          amount = amount + parseFloat(this.dataForm.paymentdoc_item0List[i].amount);
+        }
+        this.dataForm.ramount = amount;
+
+      },
+      popupSelectourceNo(e, d) {
+        this.excludeFields = [];
+        this.dataForm.paymentdoc_item0List = [];
+      },
+
       popupSelectorder(a, b) {
+        var excludeFields = [];
+        var amount = 0;
         for (let i = 0; i < this.dataForm.paymentdoc_item0List.length; i++) {
+          excludeFields.push(this.dataForm.paymentdoc_item0List[i].purchaseorderId);
           if (a == this.dataForm.paymentdoc_item0List[i].purchaseorderId) {
             this.dataForm.paymentdoc_item0List[i].lastModifyUserId = b.contract_code
             this.dataForm.paymentdoc_item0List[i].lastModifyUserName = b.num
@@ -364,10 +391,12 @@
             this.dataForm.paymentdoc_item0List[i].orgnizeId = b.rate
             this.dataForm.paymentdoc_item0List[i].deleteUserId = b.not_amount
 
-            this.dataForm.ramount = parseFloat(this.dataForm.ramount) + parseFloat(b.amount)
-
           }
+          amount = amount + parseFloat(this.dataForm.paymentdoc_item0List[i].amount);
         }
+        this.dataForm.ramount = amount;
+
+        this.excludeFields = excludeFields;
       },
 
       paymentdoc_item0Exist() {

SC-web/src/views/scm/basicInformation/paymentdoc/index.vue

@@ -30,12 +30,20 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
+
+            <el-button type="text" icon="el-icon-check" @click="addOrUpdateHandle(scope.row.id)">编辑
+            </el-button>
             <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
             <el-button type="text" icon="el-icon-download" @click="exportData()">导出
             </el-button>
             <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
+            <el-button type="text" icon="el-icon-check" @click="3">审核
+            </el-button>
+            <el-button type="text" icon="el-icon-close" @click="3">弃审
+            </el-button>
+
             <el-button type="success" size="medium" @click="paymentapply()">付款
             </el-button>
           </div>
@@ -47,63 +55,76 @@
             <screenfull isContainer/>
           </div>
         </div>
-        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-                    @selection-change="handleSelectionChange">
-          <el-table-column prop="documentNo" label="单据编号" width="0" align="left"
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
+                    @selection-change="handleSelectionChange" border>
+          <el-table-column type="index" width="50" label="序号" fixed="left" align="center"/>
+          <el-table-column prop="documentNo" label="单据编号" width="200" align="center" sortable fixed="left"
           />
-          <el-table-column prop="businessDate" label="申请时间" width="0" align="left"
+          <el-table-column prop="businessDate" label="申请时间" width="150" align="center" sortable fixed="left" sortable="custom"
           />
-          <el-table-column prop="supplierName" label="供应商名称" width="0" align="left"
+          <el-table-column prop="supplierName" label="供应商名称" width="200" align="center" sortable fixed="left"
           />
-          <el-table-column label="币别 " width="0" prop="currency" algin="left"
+          <el-table-column label="币别 " width="80" prop="currency" algin="center" sortable
           >
             <template slot-scope="scope">
               {{ scope.row.currency | dynamicText(currencyOptions) }}
             </template>
           </el-table-column>
-          <el-table-column prop="ramount" label="申请金额" width="0" align="left"
+          <el-table-column prop="ramount" label="申请金额" width="120" align="center" sortable
           />
-          <el-table-column prop="paymentAmount" label="付款金额" width="0" align="left"
+          <el-table-column prop="paymentAmount" label="付款金额" width="120" align="center"sortable
           />
-          <el-table-column prop="unpaymentAmount" label="未付款金额" width="0" align="left"
+          <el-table-column prop="unpaymentAmount" label="未付款金额" width="120" align="center"sortable
           />
-          <el-table-column prop="dueDate" label="应付日期" width="0" align="left"
+          <el-table-column prop="dueDate" label="应付日期" width="120" align="center"sortable sortable="custom"
           />
-          <el-table-column prop="collectionAccount" label="收款账户" width="0" align="left"
+          <el-table-column prop="collectionAccount" label="收款账户" width="120" align="center"sortable
           />
-          <el-table-column prop="colectionBank" label="收款银行" width="0" align="left"
+          <el-table-column prop="colectionBank" label="收款银行" width="120" align="center"sortable
           />
-          <el-table-column label="付款类型" width="0" prop="paymentType" algin="left"
+          <el-table-column label="付款类型" width="100" prop="paymentType" algin="center"sortable
           >
             <template slot-scope="scope">
               {{ scope.row.paymentType | dynamicText(paymentTypeOptions) }}
             </template>
           </el-table-column>
-          <el-table-column label="结算类型" width="0" prop="settlementType" algin="left"
+          <el-table-column label="结算类型" width="100" prop="settlementType" algin="center"sortable
           >
             <template slot-scope="scope">
               {{ scope.row.settlementType | dynamicText(settlementTypeOptions) }}
             </template>
           </el-table-column>
-          <el-table-column label="单据状态 " width="0" prop="status" algin="left"
+          <el-table-column label="单据状态 " width="100" prop="status" algin="center"sortable
           >
             <template slot-scope="scope">
               {{ scope.row.status | dynamicText(statusOptions) }}
             </template>
           </el-table-column>
-          <el-table-column prop="creatorUserName" label="制单人" width="0" align="left"
+          <el-table-column prop="creatorUserName" label="制单人" width="100" align="center"sortable
           />
           <el-table-column label="操作" fixed="right"
-                           width="150">
+                           width="200">
             <template slot-scope="scope">
+              <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+              </el-button>
               <el-button type="text"
-                         @click="addOrUpdateHandle(scope.row.id)">编辑
+                         @click="1">撤回申请
               </el-button>
-              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              <el-button type="text"
+                         @click="1">审核
               </el-button>
               <el-button type="text"
-                         @click="goDetail(scope.row.id)">详情
+                         @click="1">弃审
               </el-button>
+              <el-button type="text"
+                         @click="1">提交
+              </el-button>
+<!--              <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
+<!--              </el-button>-->
+<!--              <el-button type="text"-->
+<!--                         @click="goDetail(scope.row.id)">详情-->
+<!--              </el-button>-->
+
             </template>
           </el-table-column>
         </JNPF-table>
@@ -222,6 +243,10 @@
         }).then(res => {
           var _list = []
           for (let i = 0; i < res.data.list.length; i++) {
+            res.data.list[i].businessDate = res.data.list[i].businessDate ? res.data.list[i].businessDate.substring(0,
+              10) : '';
+            res.data.list[i].dueDate = res.data.list[i].dueDate ? res.data.list[i].dueDate
+              .substring(0, 10) : '';
             let _data = res.data.list[i]
             _list.push(_data)
           }

SC-web/src/views/scm/basicInformation/poundlist/Form.vue

@@ -1,23 +1,21 @@
 <template>
   <el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" append-to-body
-		:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
+    :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1200px">
     <el-row :gutter="15" class="">
-			<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
-				label-position="right">
+      <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
         <template v-if="!loading">
           <el-col :span="12">
             <el-form-item label="物料编码" prop="materialCode">
-							<popup-select v-model="dataForm.materialCode" placeholder="请选择" clearable
-								field="materialCode" interfaceId="381037852907038533"  :columnOptions="materialCodecolumnOptions" propsValue="item_code" relationField="item_code" popupType="dialog"
-                            popupTitle="选择数据"  popupWidth="800px">
+              <popup-select v-model="dataForm.materialCode" placeholder="请选择" clearable field="materialCode"
+                interfaceId="381037852907038533" :columnOptions="materialCodecolumnOptions" propsValue="item_code"
+                relationField="item_code" popupType="dialog" popupTitle="选择数据" popupWidth="800px">
 
               </popup-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="物料名称" prop="materialName">
-							<el-input v-model="dataForm.materialName" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+              <el-input v-model="dataForm.materialName" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
@@ -25,16 +23,15 @@
           <el-col :span="12">
             <el-form-item label="销售合同" prop="salesName">
               <popup-select v-model="dataForm.salesName" placeholder="请选择" clearable field="salesName"
-              interfaceId="381038993740949317" :columnOptions="salesNamecolumnOptions" propsValue="contract_name" relationField="contract_name" popupType="dialog"
-              popupTitle="选择数据"  popupWidth="800px">
+                interfaceId="381038993740949317" :columnOptions="salesNamecolumnOptions" propsValue="contract_name"
+                relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px">
 
               </popup-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="客户名称" prop="customerName">
-							<el-input v-model="dataForm.customerName" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+              <el-input v-model="dataForm.customerName" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
@@ -42,8 +39,8 @@
           <el-col :span="12">
             <el-form-item label="是否垫资" prop="advance">
               <el-select v-model="dataForm.advance" placeholder="请选择" clearable :style='{"width":"100%"}'>
-								<el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName"
-									:value="item.id" :disabled="item.disabled"></el-option>
+                <el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName" :value="item.id"
+                  :disabled="item.disabled"></el-option>
 
               </el-select>
             </el-form-item>
@@ -57,10 +54,9 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="运输方式" prop="transportType">
-							<el-select v-model="dataForm.transportType" placeholder="请选择" clearable
-								:style='{"width":"100%"}'>
-								<el-option v-for="(item, index) in transportTypeOptions" :key="index"
-									:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
+              <el-select v-model="dataForm.transportType" placeholder="请选择" clearable :style='{"width":"100%"}'>
+                <el-option v-for="(item, index) in transportTypeOptions" :key="index" :label="item.fullName"
+                  :value="item.id" :disabled="item.disabled"></el-option>
 
               </el-select>
             </el-form-item>
@@ -75,16 +71,15 @@
           <el-col :span="12">
             <el-form-item label="车号" prop="licenseNo">
               <popupSelect v-model="dataForm.licenseNo" placeholder="请选择" clearable field="licenseNo"
-              interfaceId="381432451370615173" :columnOptions="licenseNocolumnOptions" propsValue="ticketno" relationField="ticketno" popupType="dialog"
-              popupTitle="选择数据"  popupWidth="800px">
+                interfaceId="381432451370615173" :columnOptions="licenseNocolumnOptions" propsValue="ticketno"
+                relationField="ticketno" popupType="dialog" popupTitle="选择数据" popupWidth="800px">
 
               </popupSelect>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="业务员名称" prop="businessName">
-							<el-input v-model="dataForm.businessName" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+              <el-input v-model="dataForm.businessName" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
@@ -133,8 +128,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="司机名称" prop="driverName">
-							<el-input v-model="dataForm.driverName" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+              <el-input v-model="dataForm.driverName" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
@@ -148,25 +142,22 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="制单人" prop="creatorusername">
-							<el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+              <el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="供应商名称" prop="supplierName">
-							<el-input v-model="dataForm.supplierName" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+              <el-input v-model="dataForm.supplierName" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="采购合同" prop="purchaseName">
-							<relationForm v-model="dataForm.purchaseName" placeholder="请选择" clearable
-								field="purchaseName" modelId="294090217084722181"
-								:columnOptions="purchaseNamecolumnOptions" relationField="selectField121">
+              <relationForm v-model="dataForm.purchaseName" placeholder="请选择" clearable field="purchaseName"
+                modelId="294090217084722181" :columnOptions="purchaseNamecolumnOptions" relationField="selectField121">
 
               </relationForm>
             </el-form-item>
@@ -174,69 +165,62 @@
           <el-col :span="12">
             <el-form-item label="单位" prop="unit">
               <el-select v-model="dataForm.unit" placeholder="请选择" clearable :style='{"width":"100%"}'>
-								<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName"
-									:value="item.id" :disabled="item.disabled"></el-option>
+                <el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id"
+                  :disabled="item.disabled"></el-option>
 
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="结算重量" prop="settlement">
-							<el-input v-model="dataForm.settlement" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+              <el-input v-model="dataForm.settlement" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="采购单价" prop="purchasePrice">
-							<el-input v-model="dataForm.purchasePrice" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+              <el-input v-model="dataForm.purchasePrice" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="进项票日期" prop="inputDate">
-							<el-date-picker v-model="dataForm.inputDate" placeholder="请选择" clearable
-								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
-								value-format="timestamp">
+              <el-date-picker v-model="dataForm.inputDate" placeholder="请选择" clearable :style='{"width":"100%"}'
+                type="datetime" format="yyyy-MM-dd" value-format="timestamp">
 
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="销项票日期" prop="outputDate">
-							<el-date-picker v-model="dataForm.outputDate" placeholder="请选择" clearable
-								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
-								value-format="timestamp">
+              <el-date-picker v-model="dataForm.outputDate" placeholder="请选择" clearable :style='{"width":"100%"}'
+                type="datetime" format="yyyy-MM-dd" value-format="timestamp">
 
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="付款日期" prop="payDate">
-							<el-date-picker v-model="dataForm.payDate" placeholder="请选择" clearable
-								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
-								value-format="timestamp">
+              <el-date-picker v-model="dataForm.payDate" placeholder="请选择" clearable :style='{"width":"100%"}'
+                type="datetime" format="yyyy-MM-dd" value-format="timestamp">
 
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="回款日期" prop="paymentDate">
-							<el-date-picker v-model="dataForm.paymentDate" placeholder="请选择" clearable
-								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
-								value-format="timestamp">
+              <el-date-picker v-model="dataForm.paymentDate" placeholder="请选择" clearable :style='{"width":"100%"}'
+                type="datetime" format="yyyy-MM-dd" value-format="timestamp">
 
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="磅单日期" prop="poundDate">
-							<el-date-picker v-model="dataForm.poundDate" placeholder="请选择" clearable
-								:style='{"width":"100%"}' type="datetime" format="yyyy-MM-dd HH:mm:ss"
-								value-format="timestamp">
+              <el-date-picker v-model="dataForm.poundDate" placeholder="请选择" clearable :style='{"width":"100%"}'
+                type="datetime" format="yyyy-MM-dd" value-format="timestamp">
 
               </el-date-picker>
             </el-form-item>
@@ -339,10 +323,23 @@
             trigger: ["blur", "change"]
           }, ],
         },
-        materialCodecolumnOptions:[ {"label":"物料编码","value":"item_code"},
-          {"label":"物料名称","value":"description"},
-          {"label":"库存组织","value":"organization_id"},
-          {"label":"默认库区","value":"areaname"},],
+        materialCodecolumnOptions: [{
+            "label": "物料编码",
+            "value": "item_code"
+          },
+          {
+            "label": "物料名称",
+            "value": "description"
+          },
+          {
+            "label": "库存组织",
+            "value": "organization_id"
+          },
+          {
+            "label": "默认库区",
+            "value": "areaname"
+          },
+        ],
         salesNamecolumnOptions: [{
             "label": "合同编码",
             "value": "contract_code"
@@ -358,7 +355,8 @@
           {
             "label": "供应商/客户名称",
             "value": "name"
-          },],
+          },
+        ],
         advanceOptions: [{
           "fullName": "是",
           "id": "1"
@@ -399,7 +397,8 @@
           {
             "label": "创建时间",
             "value": "f_creatortime"
-          },],
+          },
+        ],
         purchaseNamecolumnOptions: [{
           "label": "事件等级",
           "value": "selectField121"

SC-web/src/views/scm/basicInformation/poundlist/index.vue

@@ -20,12 +20,16 @@
 			<div class="JNPF-common-layout-main JNPF-flex-main">
 				<div class="JNPF-common-head">
 					<div>
-						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+						<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
 						</el-button>
 						<el-button type="text" icon="el-icon-download" @click="exportData()">导出
 						</el-button>
 						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
 						</el-button>
+            <el-button type="text" icon="el-icon-check" @click="exportData()">生成采购
+            </el-button>
+            <el-button type="text" icon="el-icon-close" @click="exportData()">生成销售
+            </el-button>
 					</div>
 					<div class="JNPF-common-head-right">
 						<el-tooltip effect="dark" content="刷新" placement="top">
@@ -35,40 +39,41 @@
 						<screenfull isContainer />
 					</div>
 				</div>
-				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-					@selection-change="handleSelectionChange">
-					<el-table-column prop="licenseNo" label="车号" width="0" align="left" />
-					<el-table-column prop="customerName" label="客户名称" width="0" align="left" />
-					<el-table-column prop="salesName" label="销售合同" width="0" align="left" />
-					<el-table-column prop="supplierName" label="供应商名称" width="0" align="left" />
-					<el-table-column prop="purchaseName" label="采购合同" width="0" align="left" />
-					<el-table-column prop="materialCode" label="物料编码" width="0" align="left" />
-					<el-table-column prop="materialName" label="物料名称" width="0" align="left" />
-					<el-table-column label="是否垫资" width="0" prop="advance" algin="left">
+				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
+					@selection-change="handleSelectionChange" border>
+          <el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
+					<el-table-column prop="licenseNo" label="车号" fixed="left" sortable width="120" align="center" />
+					<el-table-column prop="customerName" label="客户名称" sortable width="150" align="center" />
+					<el-table-column prop="salesName" label="销售合同" sortable width="150" align="center" />
+					<el-table-column prop="supplierName" label="供应商名称" sortable width="150" align="center" />
+					<el-table-column prop="purchaseName" label="采购合同" sortable width="150" align="center" />
+					<el-table-column prop="materialCode" label="物料编码" sortable width="150" align="center" />
+					<el-table-column prop="materialName" label="物料名称" sortable width="150" align="center" />
+          <el-table-column prop="advance" label="是否垫资" sortable width="100" align="center" >
 						<template slot-scope="scope">
 							{{ scope.row.advance | dynamicText(advanceOptions) }}
 						</template>
 					</el-table-column>
-					<el-table-column label="单位" width="0" prop="unit" algin="left">
+          <el-table-column prop="unit" label="单位" sortable width="100" align="center" >
 						<template slot-scope="scope">
 							{{ scope.row.unit | dynamicText(unitOptions) }}
 						</template>
 					</el-table-column>
-					<el-table-column prop="grossWeight" label="毛重" width="0" align="left" />
-					<el-table-column prop="tareWeight" label="皮重" width="0" align="left" />
-					<el-table-column prop="buckleWeight" label="扣重" width="0" align="left" />
-					<el-table-column prop="netWeight" label="净重" width="0" align="left" />
-					<el-table-column prop="settlement" label="结算重量" width="0" align="left" />
-					<el-table-column prop="purchasePrice" label="采购单价" width="0" align="left" />
-					<el-table-column prop="salesPrice" label="销售价格" width="0" align="left" />
-					<el-table-column prop="inputDate" label="进项票日期" width="0" align="left" />
-					<el-table-column prop="outputDate" label="销项票日期" width="0" align="left" />
-					<el-table-column prop="payDate" label="付款日期" width="0" align="left" />
-					<el-table-column prop="paymentDate" label="回款日期" width="0" align="left" />
-					<el-table-column prop="poundDate" label="磅单日期" width="0" align="left" />
-					<el-table-column prop="businessName" label="业务员" width="0" align="left" />
-					<el-table-column prop="remark" label="备注" width="0" align="left" />
-					<el-table-column prop="poundPictures" label="磅单图片" width="0" align="left">
+					<el-table-column prop="grossWeight" sortable label="毛重" width="100" align="center" />
+					<el-table-column prop="tareWeight" sortable label="皮重" width="100" align="center" />
+					<el-table-column prop="buckleWeight" sortable label="扣重" width="100" align="center" />
+					<el-table-column prop="netWeight" sortable label="净重" width="100" align="center" />
+					<el-table-column prop="settlement" sortable label="结算重量" width="100" align="center" />
+					<el-table-column prop="purchasePrice" sortable label="采购单价" width="100" align="center" />
+					<el-table-column prop="salesPrice" sortable label="销售价格" width="100" align="center" />
+					<el-table-column prop="inputDate" sortable label="进项票日期" width="150" align="center" />
+					<el-table-column prop="outputDate" sortable label="销项票日期" width="150" align="center" />
+					<el-table-column prop="payDate" sortable label="付款日期" width="150" align="center" />
+					<el-table-column prop="paymentDate" sortable label="回款日期" width="150" align="center" />
+					<el-table-column prop="poundDate" sortable label="磅单日期" width="150" align="center" />
+					<el-table-column prop="businessName" sortable label="业务员" width="150" align="center" />
+					<el-table-column prop="remark" sortable label="备注" width="150" align="center" />
+					<el-table-column prop="poundPictures" label="磅单图片" width="150" align="center">
 						<template slot-scope="scope">
 							<span v-for="(item,index) in JSON.parse(scope.row.poundPictures)" :key="index">
 								<el-popover placement="bottom" trigger="click" width="1000">
@@ -83,7 +88,7 @@
 							</span>
 						</template>
 					</el-table-column>
-					<el-table-column prop="vehiclePictures" label="车辆图片" width="0" align="left">
+					<el-table-column prop="vehiclePictures" label="车辆图片" width="150" align="center">
 						<template slot-scope="scope">
 							<span v-for="(item,index) in JSON.parse(scope.row.vehiclePictures)" :key="index">
 								<el-popover placement="bottom" trigger="click" width="1000">
@@ -98,7 +103,7 @@
 							</span>
 						</template>
 					</el-table-column>
-					<el-table-column label="操作" fixed="right" width="100">
+					<el-table-column label="操作" fixed="right" width="100" align="center">
 						<template slot-scope="scope">
 							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
 							</el-button>
@@ -327,6 +332,16 @@
 				}).then(res => {
 					var _list = [];
 					for (let i = 0; i < res.data.list.length; i++) {
+            res.data.list[i].inputDate = res.data.list[i].inputDate ? res.data.list[i].inputDate.substring(0,
+              10) : '';
+            res.data.list[i].outputDate = res.data.list[i].outputDate ? res.data.list[i].outputDate
+              .substring(0, 10) : '';
+            res.data.list[i].payDate = res.data.list[i].payDate ? res.data.list[i].payDate
+              .substring(0, 10) : '';
+            res.data.list[i].paymentDate = res.data.list[i].paymentDate ? res.data.list[i].paymentDate
+              .substring(0, 10) : '';
+            res.data.list[i].poundDate = res.data.list[i].poundDate ? res.data.list[i].poundDate
+              .substring(0, 10) : '';
 						let _data = res.data.list[i];
 						_list.push(_data)
 					}

SC-web/src/views/scm/basicInformation/receiptin/Form.vue

@@ -48,7 +48,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="入库数量" prop="receiptnum">
-              <el-input v-model="dataForm.receiptnum" placeholder="请输入入库数量" readonly>
+              <el-input v-model="dataForm.receiptnum" placeholder="请输入入库数量" readonly >
 
               </el-input>
             </el-form-item>

SC-web/src/views/scm/basicInformation/reservoirarea/Form.vue

@@ -34,6 +34,7 @@
                 </el-form-item>
             </el-col>
             <el-col :span="24" >
+<<<<<<< HEAD
                 <el-form-item  label="安全库存" prop="safety"  :rules="[
               {
               required: true,
@@ -46,6 +47,13 @@
               }
               ]" >
                     <el-input-number    v-model="dataForm.safety" placeholder="数字文本"  :step="1" >
+=======
+                <el-form-item  label="安全库存"
+ prop="safety" >
+                    <el-input-number    v-model="dataForm.safety"
+ placeholder="数字文本"  :step="1" >
+
+>>>>>>> ddaf1c11476266e400901543653df705c0f58f87
                 </el-input-number>
                 </el-form-item>
             </el-col>

SC-web/src/views/scm/basicInformation/saleorder/index.vue

@@ -11,10 +11,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="单据状态 ">
-                                        <el-select v-model="query.status" placeholder="请选择"
-                                                   clearable>
-                                            <el-option v-for="(item, index) in statusOptions" :key="index"
-                                                       :label="item.fullName" :value="item.id"
+              <el-select v-model="query.status" placeholder="请选择" clearable>
+                <el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id"
                   :disabled="item.disabled"></el-option>
               </el-select>
             </el-form-item>
@@ -30,95 +28,101 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="addOrUpdateHandle()">新增
+            <el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
-                                    <el-button type="text" icon="el-icon-download" @click="exportData()" >导出
+            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
             </el-button>
-                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
+            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            </el-button>
+            <el-button type="text" icon="el-icon-check" @click="exportData()">发货
+            </el-button>
+            <el-button type="text" icon="el-icon-close" @click="exportData()">发票录入
+            </el-button>
+            <el-button type="text" icon="el-icon-check" @click="exportData()">回款
+            </el-button>
+            <el-button type="text" icon="el-icon-close" @click="exportData()">归档
+            </el-button>
+            <el-button type="text" icon="el-icon-check" @click="exportData()">退货
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
-                            <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
-                                     @click="reset()"/>
+              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="reset()" />
             </el-tooltip>
-                        <screenfull isContainer/>
+            <screenfull isContainer />
           </div>
         </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="documentNo" label="单据编号" width="0" align="left"
-/>
-                            <el-table-column prop="costomerName" label="客户名称" width="0" align="left"
-/>
-                            <el-table-column prop="price" label="金额" width="0" align="left"
-/>
-                            <el-table-column prop="num" label="数量" width="0" align="left"
-/>
-                                <el-table-column label="币别" width="0" prop="currency" algin="left"
->
+        <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
+          @selection-change="handleSelectionChange" border>
+          <el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
+          <el-table-column prop="documentNo" label="单据编号" sortable fixed="left" width="200" align="center" />
+          <el-table-column prop="costomerName" label="客户名称" sortable fixed="left" width="150" align="center" />
+          <el-table-column prop="price" label="金额" sortable width="150" align="center" />
+          <el-table-column prop="num" label="数量" sortable width="150" align="center" />
+          <el-table-column label="币别" width="100" sortable prop="currency" align="center" >
             <template slot-scope="scope">
               {{ scope.row.currency | dynamicText(currencyOptions) }}
             </template>
           </el-table-column>
-                            <el-table-column prop="amountCollected" label="已回款金额" width="0" align="left"
-/>
-                            <el-table-column prop="invoiceNum" label="发票数量" width="0" align="left"
-/>
-                            <el-table-column prop="invoiceAmount" label="发票金额" width="0" align="left"
-/>
-                                <el-table-column label="来源系统" width="0" prop="sourceSystem" algin="left"
->
+          <el-table-column prop="amountCollected" sortable label="已回款金额" width="150" align="center" />
+          <el-table-column prop="invoiceNum" sortable label="发票数量" width="150" align="center" />
+          <el-table-column prop="invoiceAmount" sortable label="发票金额" width="150" align="center" />
+          <el-table-column label="来源系统" width="150" sortable prop="sourceSystem" align="center" >
             <template slot-scope="scope">
               {{ scope.row.sourceSystem | dynamicText(sourceSystemOptions) }}
             </template>
           </el-table-column>
-                                <el-table-column label="单据状态 " width="0" prop="status" algin="left"
->
+          <el-table-column label="单据状态 " width="150" sortable prop="status" align="center" >
             <template slot-scope="scope">
               {{ scope.row.status | dynamicText(statusOptions) }}
             </template>
           </el-table-column>
-                            <el-table-column prop="creatorUserName" label="制单人" width="0" align="left"
-/>
-                        <el-table-column label="操作" fixed="right"
-width="150" >
+          <el-table-column prop="creatorUserName" label="制单人" sortable width="150" align="center" />
+          <el-table-column label="操作" fixed="right" width="150" align="center" >
             <template slot-scope="scope">
-                                        <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
+              <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
               <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
-                                        <el-button type="text"  
-                                                   @click="goDetail(scope.row.id)">详情
+              <el-button type="text" @click="goDetail(scope.row.id)">详情
               </el-button>
             </template>
           </el-table-column>
         </JNPF-table>
-                    <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+          @pagination="initData" />
       </div>
     </div>
-        <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
-        <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
-        <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
+    <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+    <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+    <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
   </div>
 </template>
 
 <script>
   import request from '@/utils/request'
-    import {getDictionaryDataSelector} from '@/api/systemData/dictionary'
+  import {
+    getDictionaryDataSelector
+  } from '@/api/systemData/dictionary'
   import JNPFForm from './Form'
   import ExportBox from './ExportBox'
-    import {getDataInterfaceRes} from '@/api/systemData/dataInterface'
+  import {
+    getDataInterfaceRes
+  } from '@/api/systemData/dataInterface'
   import Detail from './Detail'
 
   export default {
-        components: {JNPFForm, ExportBox,Detail},
+    components: {
+      JNPFForm,
+      ExportBox,
+      Detail
+    },
     data() {
       return {
         detailVisible: false,
         query: {
-                                documentNo:undefined,
-                                status:undefined,
+          documentNo: undefined,
+          status: undefined,
         },
         treeProps: {
           children: 'children',
@@ -127,7 +131,8 @@ width="150" >
         },
         list: [],
         listLoading: true,
- multipleSelection: [],                    total: 0,
+        multipleSelection: [],
+        total: 0,
         listQuery: {
           currentPage: 1,
           pageSize: 20,
@@ -136,25 +141,99 @@ width="150" >
         },
         formVisible: false,
         exportBoxVisible: false,
-                columnList: [
-                    {prop: 'documentNo', label: '单据编号'},
-                    {prop: 'costomerName', label: '客户名称'},
-                    {prop: 'price', label: '金额'},
-                    {prop: 'num', label: '数量'},
-                    {prop: 'currency', label: '币别'},
-                    {prop: 'amountCollected', label: '已回款金额'},
-                    {prop: 'invoiceNum', label: '发票数量'},
-                    {prop: 'invoiceAmount', label: '发票金额'},
-                    {prop: 'sourceSystem', label: '来源系统'},
-                    {prop: 'status', label: '单据状态 '},
-                    {prop: 'creatorUserName', label: '制单人'},
+        columnList: [{
+            prop: 'documentNo',
+            label: '单据编号'
+          },
+          {
+            prop: 'costomerName',
+            label: '客户名称'
+          },
+          {
+            prop: 'price',
+            label: '金额'
+          },
+          {
+            prop: 'num',
+            label: '数量'
+          },
+          {
+            prop: 'currency',
+            label: '币别'
+          },
+          {
+            prop: 'amountCollected',
+            label: '已回款金额'
+          },
+          {
+            prop: 'invoiceNum',
+            label: '发票数量'
+          },
+          {
+            prop: 'invoiceAmount',
+            label: '发票金额'
+          },
+          {
+            prop: 'sourceSystem',
+            label: '来源系统'
+          },
+          {
+            prop: 'status',
+            label: '单据状态 '
+          },
+          {
+            prop: 'creatorUserName',
+            label: '制单人'
+          },
         ],
-                                currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
-                            currencyProps:{"label":"fullName","value":"id"},
-                                sourceSystemOptions:[{"fullName":"人工创建","id":"0"},{"fullName":"商城平台","id":"1"}],
-                            sourceSystemProps:{"label":"fullName","value":"id"},
-                                statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待回款","id":"3"},{"fullName":"回款中","id":"4"},{"fullName":"归档","id":"5"}],
-                            statusProps:{"label":"fullName","value":"id"},
+        currencyOptions: [{
+          "fullName": "人民币",
+          "id": "0"
+        }, {
+          "fullName": "美元",
+          "id": "1"
+        }, {
+          "fullName": "英镑",
+          "id": "2"
+        }],
+        currencyProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        sourceSystemOptions: [{
+          "fullName": "人工创建",
+          "id": "0"
+        }, {
+          "fullName": "商城平台",
+          "id": "1"
+        }],
+        sourceSystemProps: {
+          "label": "fullName",
+          "value": "id"
+        },
+        statusOptions: [{
+          "fullName": "已保存",
+          "id": "0"
+        }, {
+          "fullName": "开票中",
+          "id": "1"
+        }, {
+          "fullName": "付款申请",
+          "id": "2"
+        }, {
+          "fullName": "待回款",
+          "id": "3"
+        }, {
+          "fullName": "回款中",
+          "id": "4"
+        }, {
+          "fullName": "归档",
+          "id": "5"
+        }],
+        statusProps: {
+          "label": "fullName",
+          "value": "id"
+        },
       }
     },
     computed: {
@@ -166,13 +245,17 @@ width="150" >
       this.initData()
     },
     methods: {
-            goDetail(id){
+      goDetail(id) {
         this.detailVisible = true
         this.$nextTick(() => {
           this.$refs.Detail.init(id)
         })
       },
-            sortChange({column, prop, order}) {
+      sortChange({
+        column,
+        prop,
+        order
+      }) {
         this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
         this.listQuery.sidx = !order ? '' : prop
         this.initData()
@@ -182,15 +265,15 @@ width="150" >
         let _query = {
           ...this.listQuery,
           ...this.query,
-                    menuId:this.menuId
+          menuId: this.menuId
         };
         request({
           url: `/api/saleorder/Saleorder/getList`,
           method: 'post',
           data: _query
         }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
+          var _list = [];
+          for (let i = 0; i < res.data.list.length; i++) {
             let _data = res.data.list[i];
             _list.push(_data)
           }
@@ -216,8 +299,7 @@ width="150" >
               }
             });
           })
-                }).catch(() => {
-                });
+        }).catch(() => {});
       },
       handleSelectionChange(val) {
         const res = val.map(item => item.id)
@@ -248,8 +330,7 @@ width="150" >
               }
             });
           })
-                    }).catch(() => {
-                    })
+        }).catch(() => {})
       },
       addOrUpdateHandle(id, isDetail) {
         this.formVisible = true
@@ -264,7 +345,12 @@ width="150" >
         })
       },
       download(data) {
-                let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
+        let query = {
+          ...data,
+          ...this.listQuery,
+          ...this.query,
+          menuId: this.menuId
+        }
         request({
           url: `/api/saleorder/Saleorder/Actions/Export`,
           method: 'GET',

SC-web/src/views/scm/basicInformation/supplier/Detail.vue

@@ -6,13 +6,6 @@
 <el-row :gutter="15" class="">
 <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
     <template v-if="!loading">
-	    <el-col :span="24" >
-		<el-form-item  label-width="0">
-		<JNPF-Text  :style='{"width":"100%"}'
- :textStyle='{"color":"#000000","font-weight":"bold","text-decoration":"none","font-size":18,"line-height":32,"font-style":"normal","text-align":"left"}' value="供应商编辑">
-		</JNPF-Text>
-	</el-form-item>
-	</el-col>
             <el-col :span="12" >
                 <el-form-item  label="供应商编码"  
  prop="supplierCode" >
@@ -20,33 +13,33 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="供应商名称"  
- prop="supplierName" >
-                        <p>{{dataForm.supplierName}}</p>
+                <el-form-item  label="所属公司"  
+ prop="companyId" >
+                        <p>{{dataForm.companyId}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="供应商地点ID"  
- prop="supplierSiteId" >
-                        <p>{{dataForm.supplierSiteId}}</p>
+                <el-form-item  label="供应商名称"  
+ prop="supplierName" >
+                        <p>{{dataForm.supplierName}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="供应商地点名称"  
- prop="supplierSiteCode" >
-                        <p>{{dataForm.supplierSiteCode}}</p>
+                <el-form-item  label="国家"  
+ prop="country" >
+                        <p>{{dataForm.country}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="公司名称"  
- prop="companyId" >
-                        <p>{{dataForm.companyId}}</p>
+                <el-form-item  label="供货指标"  
+ prop="supply" >
+                        <p>{{dataForm.supply}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="地址"  
- prop="address" >
-                        <p>{{dataForm.address}}</p>
+                <el-form-item  label="省"  
+ prop="province" >
+                        <p>{{dataForm.province}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
@@ -55,6 +48,12 @@
                         <p>{{dataForm.contactName}}</p>
                 </el-form-item>
             </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="供应商等级"  
+ prop="supplierLevel" >
+                         <p>{{ dataForm.supplierLevel | dynamicText(supplierLevelOptions) }} </p>
+                </el-form-item>
+            </el-col>
             <el-col :span="12" >
                 <el-form-item  label="联系电话"  
  prop="contactPhone" >
@@ -62,15 +61,75 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="供应商等级"  
- prop="supplierLevel" >
-                         <p>{{ dataForm.supplierLevel | dynamicText(supplierLevelOptions) }} </p>
+                <el-form-item  label="供应商性质"  
+ prop="enterprise" >
+                         <p>{{ dataForm.enterprise | dynamicText(enterpriseOptions) }} </p>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="启用"  
+                <el-form-item  label="地址"  
+ prop="address" >
+                        <p>{{dataForm.address}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="供应商类型"  
+ prop="classification" >
+                         <p>{{ dataForm.classification | dynamicText(classificationOptions) }} </p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="开户行"  
+ prop="bank" >
+                        <p>{{dataForm.bank}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="默认税码"  
+ prop="taxCode" >
+                         <p>{{ dataForm.taxCode | dynamicText(taxCodeOptions) }} </p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="纳税编号"  
+ prop="vatRegistrationNum" >
+                        <p>{{dataForm.vatRegistrationNum}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="是否采购"  
+ prop="isPurchase" >
+                         <p>{{ dataForm.isPurchase | dynamicText(isPurchaseOptions) }} </p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="银行账户"  
+ prop="bankAccount" >
+                        <p>{{dataForm.bankAccount}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="是否付款"  
+ prop="isPayment" >
+                         <p>{{ dataForm.isPayment | dynamicText(isPaymentOptions) }} </p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="应付科目"  
+ prop="payable" >
+                        <p>{{dataForm.payable}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="是否启用"  
  prop="status" >
-                        <p>{{dataForm.status}}</p>
+                         <p>{{ dataForm.status | dynamicText(statusOptions) }} </p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="预付科目"  
+ prop="prepaid" >
+                        <p>{{dataForm.prepaid}}</p>
                 </el-form-item>
             </el-col>
     </template>
@@ -97,17 +156,37 @@
             dataForm: {
                 id :'',
                             supplierCode : '',
+                            companyId : "",
                             supplierName : '',
-                            supplierSiteId : '',
-                            supplierSiteCode : '',
-                            companyId : [],
-                            address : '',
+                            country : "CHINA",
+                            supply : '',
+                            province : [],
                             contactName : '',
-                            contactPhone : '',
                             supplierLevel : "1",
-                            status : 1,
+                            contactPhone : '',
+                            enterprise : "0",
+                            address : '',
+                            classification : "0",
+                            bank : '',
+                            taxCode : "0",
+                            vatRegistrationNum : '',
+                            isPurchase : "0",
+                            bankAccount : '',
+                            isPayment : "0",
+                            payable : '',
+                            status : "1",
+                            prepaid : '',
+                            supplierSiteCode : '',
+                            creatorTime : "",
+                            lastModifyTime : "",
             },
                                 supplierLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"},{"fullName":"四级","id":"4"}],
+                                enterpriseOptions:[{"fullName":"民营","id":"0"},{"fullName":"私营","id":"1"}],
+                                classificationOptions:[{"fullName":"国内","id":"0"},{"fullName":"国外","id":"1"}],
+                                taxCodeOptions:[{"fullName":"13个点","id":"0"},{"fullName":"9个点","id":"1"},{"fullName":"6个点","id":"2"},{"fullName":"5个点","id":"3"}],
+                                isPurchaseOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
+                                isPaymentOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
+                                statusOptions:[{"fullName":"启用","id":"1"},{"fullName":"停用","id":"2"}],
 
         }
         },
@@ -130,7 +209,7 @@
                     if(this.dataForm.id){
                         this.loading = true
                         request({
-                            url: '/api/supplier/Supplier/detail/'+this.dataForm.id,
+                            url: '/api/example/Supplier/detail/'+this.dataForm.id,
                             method: 'get'
                         }).then(res => {
                             this.dataInfo(res.data)

SC-web/src/views/scm/basicInformation/supplier/Form.vue

@@ -6,13 +6,6 @@
 <el-row :gutter="15" class="">
 <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
     <template v-if="!loading">
-	    <el-col :span="24" >
-		<el-form-item  label-width="0">
-		<JNPF-Text  :style='{"width":"100%"}'
- :textStyle='{"color":"#000000","font-weight":"bold","text-decoration":"none","font-size":18,"line-height":32,"font-style":"normal","text-align":"left"}' value="供应商编辑">
-		</JNPF-Text>
-	</el-form-item>
-	</el-col>
             <el-col :span="12" >
                 <el-form-item  label="供应商编码"  
  prop="supplierCode" >
@@ -22,6 +15,17 @@
                 </el-input>
                 </el-form-item>
             </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="所属公司"  
+ prop="companyId" >
+                    <popupSelect    v-model="dataForm.companyId"
+ placeholder="请选择"  clearable  field="companyId" interfaceId="394016341591396805" :columnOptions="companyIdcolumnOptions" propsValue="F_Id" relationField="F_FullName" popupType="dialog"
+ popupTitle="选择数据"  popupWidth="800px"
+  >
+
+                </popupSelect>
+                </el-form-item>
+            </el-col>
             <el-col :span="12" >
                 <el-form-item  label="供应商名称"  
  prop="supplierName" >
@@ -32,39 +36,30 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="供应商地点ID"  
- prop="supplierSiteId" >
-                    <el-input    v-model="dataForm.supplierSiteId"
- placeholder="请输入供应商地点ID"  clearable  :style='{"width":"100%"}'>
+                <el-form-item  label="国家"  
+ prop="country" >
+                    <el-input    v-model="dataForm.country"
+ placeholder="请输入国家"  clearable  :style='{"width":"100%"}'>
 
                 </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="供应商地点名称"  
- prop="supplierSiteCode" >
-                    <el-input    v-model="dataForm.supplierSiteCode"
- placeholder="请输入供应商地点名称"  clearable  :style='{"width":"100%"}'>
+                <el-form-item  label="供货指标"  
+ prop="supply" >
+                    <el-input    v-model="dataForm.supply"
+ placeholder="请输入供货指标"  clearable  :style='{"width":"100%"}'>
 
                 </el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="公司名称"  
- prop="companyId" >
-                    <com-select    v-model="dataForm.companyId"
- placeholder="请选择"  clearable >
+                <el-form-item  label="省"  
+ prop="province" >
+                    <JNPF-Address    v-model="dataForm.province"
+ placeholder="请选择省市区"  clearable  :level=2 >
 
-                </com-select>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="地址"  
- prop="address" >
-                    <el-input    v-model="dataForm.address"
- placeholder="请输入地址"  clearable  :style='{"width":"100%"}'>
-
-                </el-input>
+                </JNPF-Address>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
@@ -76,6 +71,16 @@
                 </el-input>
                 </el-form-item>
             </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="供应商等级"  
+ prop="supplierLevel" >
+                    <el-select    v-model="dataForm.supplierLevel"
+ placeholder="请选择"  clearable  :style='{"width":"100%"}'>
+                            <el-option v-for="(item, index) in supplierLevelOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+
+                </el-select>
+                </el-form-item>
+            </el-col>
             <el-col :span="12" >
                 <el-form-item  label="联系电话"  
  prop="contactPhone" >
@@ -86,22 +91,127 @@
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="供应商等级"  
- prop="supplierLevel" >
-                    <el-select    v-model="dataForm.supplierLevel"
- placeholder="请选择"  clearable  :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in supplierLevelOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+                <el-form-item  label="供应商性质"  
+ prop="enterprise" >
+                    <el-radio-group    v-model="dataForm.enterprise"
+ size="small" >
+                            <el-radio v-for="(item, index) in enterpriseOptions" :key="index" :label="item.id" :disabled="item.disabled" >
+                                {{item.fullName}}
+                            </el-radio>
+
+                </el-radio-group>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="地址"  
+ prop="address" >
+                    <el-input    v-model="dataForm.address"
+ placeholder="请输入地址"  clearable  :style='{"width":"100%"}'>
+
+                </el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="供应商类型"  
+ prop="classification" >
+                    <el-radio-group    v-model="dataForm.classification"
+ size="small" >
+                            <el-radio v-for="(item, index) in classificationOptions" :key="index" :label="item.id" :disabled="item.disabled" >
+                                {{item.fullName}}
+                            </el-radio>
+
+                </el-radio-group>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="开户行"  
+ prop="bank" >
+                    <el-input    v-model="dataForm.bank"
+ placeholder="请输入开户行"  clearable  :style='{"width":"100%"}'>
+
+                </el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="默认税码"  
+ prop="taxCode" >
+                    <el-select    v-model="dataForm.taxCode"
+ placeholder="请选择税码"  clearable  :style='{"width":"100%"}'>
+                            <el-option v-for="(item, index) in taxCodeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
 
                 </el-select>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="启用"  
+                <el-form-item  label="纳税编号"  
+ prop="vatRegistrationNum" >
+                    <el-input    v-model="dataForm.vatRegistrationNum"
+ placeholder="请输入纳税编号"  clearable  :style='{"width":"100%"}'>
+
+                </el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="是否采购"  
+ prop="isPurchase" >
+                    <el-radio-group    v-model="dataForm.isPurchase"
+ size="small" >
+                            <el-radio v-for="(item, index) in isPurchaseOptions" :key="index" :label="item.id" :disabled="item.disabled" >
+                                {{item.fullName}}
+                            </el-radio>
+
+                </el-radio-group>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="银行账户"  
+ prop="bankAccount" >
+                    <el-input    v-model="dataForm.bankAccount"
+ placeholder="请输入银行账户"  clearable  :style='{"width":"100%"}'>
+
+                </el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="是否付款"  
+ prop="isPayment" >
+                    <el-radio-group    v-model="dataForm.isPayment"
+ size="small" >
+                            <el-radio v-for="(item, index) in isPaymentOptions" :key="index" :label="item.id" :disabled="item.disabled" >
+                                {{item.fullName}}
+                            </el-radio>
+
+                </el-radio-group>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="应付科目"  
+ prop="payable" >
+                    <el-input    v-model="dataForm.payable"
+ placeholder="请输入应付科目"  clearable  :style='{"width":"100%"}'>
+
+                </el-input>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="是否启用"  
  prop="status" >
-                    <el-switch    v-model="dataForm.status"
- :active-value="1"  :inactive-value="0" >
+                    <el-radio-group    v-model="dataForm.status"
+ size="small" >
+                            <el-radio v-for="(item, index) in statusOptions" :key="index" :label="item.id" :disabled="item.disabled" >
+                                {{item.fullName}}
+                            </el-radio>
+
+                </el-radio-group>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="预付科目"  
+ prop="prepaid" >
+                    <el-input    v-model="dataForm.prepaid"
+ placeholder="请输入预付科目"  clearable  :style='{"width":"100%"}'>
 
-                </el-switch>
+                </el-input>
                 </el-form-item>
             </el-col>
     </template>
@@ -127,15 +237,29 @@
                 isDetail: false,
             dataForm: {
                             supplierCode : '',
+                            companyId : "",
                             supplierName : '',
-                            supplierSiteId : '',
-                            supplierSiteCode : '',
-                            companyId : [],
-                            address : '',
+                            country : "CHINA",
+                            supply : '',
+                            province : [],
                             contactName : '',
-                            contactPhone : '',
                             supplierLevel : "1",
-                            status : 1,
+                            contactPhone : '',
+                            enterprise : "0",
+                            address : '',
+                            classification : "0",
+                            bank : '',
+                            taxCode : "0",
+                            vatRegistrationNum : '',
+                            isPurchase : "0",
+                            bankAccount : '',
+                            isPayment : "0",
+                            payable : '',
+                            status : "1",
+                            prepaid : '',
+                            supplierSiteCode : '',
+                            creatorTime : "",
+                            lastModifyTime : "",
             },
             rules:
             {
@@ -153,8 +277,21 @@
                                     trigger: 'blur'
                                 },
                         ],
+                            supply: [
+                        ],
+                            contactPhone: [
+                        ],
+                            bankAccount: [
+                        ],
             },
+                    companyIdcolumnOptions:[ {"label":"公司编码","value":"F_EnCode"}, {"label":"公司名称","value":"F_FullName"},],
                         supplierLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"},{"fullName":"四级","id":"4"}],
+                        enterpriseOptions:[{"fullName":"民营","id":"0"},{"fullName":"私营","id":"1"}],
+                        classificationOptions:[{"fullName":"国内","id":"0"},{"fullName":"国外","id":"1"}],
+                        taxCodeOptions:[{"fullName":"13个点","id":"0"},{"fullName":"9个点","id":"1"},{"fullName":"6个点","id":"2"},{"fullName":"5个点","id":"3"}],
+                        isPurchaseOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
+                        isPaymentOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
+                        statusOptions:[{"fullName":"启用","id":"1"},{"fullName":"停用","id":"2"}],
 
         }
         },
@@ -184,7 +321,7 @@
                     if(this.dataForm.id){
                         this.loading = true
                         request({
-                            url: '/api/supplier/Supplier/'+this.dataForm.id,
+                            url: '/api/example/Supplier/'+this.dataForm.id,
                             method: 'get'
                         }).then(res => {
                             this.dataInfo(res.data)
@@ -208,7 +345,7 @@
                 var _data =this.dataList()
                 if (!this.dataForm.id) {
                     request({
-                        url: '/api/supplier/Supplier',
+                        url: '/api/example/Supplier',
                         method: 'post',
                         data: _data
                     }).then((res) => {
@@ -224,7 +361,7 @@
                     })
                 }else{
                     request({
-                        url: '/api/supplier/Supplier/'+this.dataForm.id,
+                        url: '/api/example/Supplier/'+this.dataForm.id,
                         method: 'PUT',
                         data: _data
                     }).then((res) => {
@@ -242,14 +379,12 @@
             },
             dataList(){
                 var _data = JSON.parse(JSON.stringify(this.dataForm));
-                        _data.companyId = JSON.stringify(_data.companyId)
-                        _data.status = parseInt(_data.status)
+                        _data.province = JSON.stringify(_data.province)
                 return _data;
             },
             dataInfo(dataAll){
                 let _dataAll =dataAll
-                        _dataAll.companyId = JSON.parse( _dataAll.companyId)
-                        _dataAll.status = parseInt( _dataAll.status)
+                        _dataAll.province = JSON.parse( _dataAll.province)
                 this.dataForm = _dataAll
             },
         },

SC-web/src/views/scm/basicInformation/supplier/index.vue

@@ -14,10 +14,33 @@
                                         <el-input v-model="query.supplierName" placeholder="请输入" clearable>  </el-input>
                                 </el-form-item>
                             </el-col>
+                        <el-col :span="6">
+                                <el-form-item label="联系人">
+                                        <el-input v-model="query.contactName" placeholder="请输入" clearable>  </el-input>
+                                </el-form-item>
+                            </el-col>
+                        <template v-if="showAll">
+                                    <el-col :span="6">
+                                        <el-form-item label="联系电话">
+                                                <el-input v-model="query.contactPhone" placeholder="请输入" clearable>  </el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="6">
+                                        <el-form-item label="供应商地点">
+                                                <el-input v-model="query.supplierSiteCode" placeholder="请输入" clearable>  </el-input>
+                                        </el-form-item>
+                                    </el-col>
+                        </template>
                     <el-col :span="6">
                         <el-form-item>
                             <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
                             <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+                                <el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll">
+                                    展开
+                                </el-button>
+                                <el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else>
+                                    收起
+                                </el-button>
                         </el-form-item>
                     </el-col>
                 </el-form>
@@ -43,17 +66,17 @@
                 <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
                             <el-table-column prop="supplierCode" label="供应商编码" width="0" align="left"
  sortable="custom" />
-                            <el-table-column prop="supplierName" label="供应商名称" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="supplierSiteId" label="供应商地点ID" width="0" align="left"
+                            <el-table-column prop="companyId" label="所属公司" width="0" align="left"
  sortable="custom" />
-                            <el-table-column prop="supplierSiteCode" label="供应商地点名称" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="companyId" label="公司名称" width="0" align="left"
+                            <el-table-column prop="supplierName" label="供应商名称" width="0" align="left"
  sortable="custom" />
+                            <el-table-column prop="country" label="国家" width="0" align="left"
+/>
+                            <el-table-column prop="supply" label="供货指标" width="0" align="left"
+/>
+                            <el-table-column prop="province" label="省" width="0" align="left"
+/>
                             <el-table-column prop="contactName" label="联系人" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="contactPhone" label="联系电话" width="0" align="left"
  sortable="custom" />
                                 <el-table-column label="供应商等级" width="0" prop="supplierLevel" algin="left"
  sortable="custom" >
@@ -61,26 +84,66 @@
                                         {{ scope.row.supplierLevel | dynamicText(supplierLevelOptions) }}
                                     </template>
                                 </el-table-column>
+                            <el-table-column prop="contactPhone" label="联系电话" width="0" align="left"
+ sortable="custom" />
+                                <el-table-column label="供应商性质" width="0" prop="enterprise" algin="left"
+>
+                                    <template slot-scope="scope">
+                                        {{ scope.row.enterprise | dynamicText(enterpriseOptions) }}
+                                    </template>
+                                </el-table-column>
                             <el-table-column prop="address" label="地址" width="0" align="left"
  sortable="custom" />
-                            <el-table-column prop="status" label="启用" width="0" align="left" sortable="custom" >
+                                <el-table-column label="供应商类型" width="0" prop="classification" algin="left"
+>
+                                    <template slot-scope="scope">
+                                        {{ scope.row.classification | dynamicText(classificationOptions) }}
+                                    </template>
+                                </el-table-column>
+                            <el-table-column prop="bank" label="开户行" width="0" align="left"
+/>
+                            <el-table-column prop="vatRegistrationNum" label="纳税编号" width="0" align="left"
+/>
+                            <el-table-column prop="bankAccount" label="银行账户" width="0" align="left"
+/>
+                                <el-table-column label="默认税码" width="0" prop="taxCode" algin="left"
+>
+                                    <template slot-scope="scope">
+                                        {{ scope.row.taxCode | dynamicText(taxCodeOptions) }}
+                                    </template>
+                                </el-table-column>
+                            <el-table-column prop="payable" label="应付科目" width="0" align="left"
+/>
+                                <el-table-column label="是否采购" width="0" prop="isPurchase" algin="left"
+>
+                                    <template slot-scope="scope">
+                                        {{ scope.row.isPurchase | dynamicText(isPurchaseOptions) }}
+                                    </template>
+                                </el-table-column>
+                            <el-table-column prop="prepaid" label="预付科目" width="0" align="left"
+/>
+                                <el-table-column label="是否付款" width="0" prop="isPayment" algin="left"
+>
+                                    <template slot-scope="scope">
+                                        {{ scope.row.isPayment | dynamicText(isPaymentOptions) }}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="是否启用" width="0" prop="status" algin="left"
+ sortable="custom" >
                                     <template slot-scope="scope">
-                                <el-tag type="success" disable-transitions v-if="scope.row.status == '1'">启用
-                                </el-tag>
-                                <el-tag type="danger" disable-transitions v-else>停用</el-tag>
+                                        {{ scope.row.status | dynamicText(statusOptions) }}
                                     </template>
                                 </el-table-column>
+                            <el-table-column prop="supplierSiteCode" label="供应商地点" width="0" align="left"
+ sortable="custom" />
                         <el-table-column label="操作" fixed="right"
-width="150" >
+                                         width="100" >
                             <template slot-scope="scope">
                                         <el-button type="text"
                                                    @click="addOrUpdateHandle(scope.row.id)" >编辑
                                         </el-button>
                                         <el-button type="text" class="JNPF-table-delBtn"  @click="handleDel(scope.row.id)">删除
                                         </el-button>
-                                        <el-button type="text"
-                                                   @click="goDetail(scope.row.id)">详情
-                                        </el-button>
                             </template>
                         </el-table-column>
                 </JNPF-table>
@@ -105,10 +168,14 @@ width="150" >
         components: {JNPFForm, ExportBox,Detail},
         data() {
             return {
+                    showAll: false,
                 detailVisible: false,
                 query: {
                                 supplierCode:undefined,
                                 supplierName:undefined,
+                                contactName:undefined,
+                                contactPhone:undefined,
+                                supplierSiteCode:undefined,
                 },
                 treeProps: {
                     children: 'children',
@@ -122,24 +189,48 @@ width="150" >
                         currentPage: 1,
                         pageSize: 20,
                     sort: "desc",
-                    sidx: "supplierCode",
+                    sidx: "creatorTime",
                 },
                 formVisible: false,
                 exportBoxVisible: false,
                 columnList: [
                     {prop: 'supplierCode', label: '供应商编码'},
+                    {prop: 'companyId', label: '所属公司'},
                     {prop: 'supplierName', label: '供应商名称'},
-                    {prop: 'supplierSiteId', label: '供应商地点ID'},
-                    {prop: 'supplierSiteCode', label: '供应商地点名称'},
-                    {prop: 'companyId', label: '公司名称'},
+                    {prop: 'country', label: '国家'},
+                    {prop: 'supply', label: '供货指标'},
+                    {prop: 'province', label: '省'},
                     {prop: 'contactName', label: '联系人'},
-                    {prop: 'contactPhone', label: '联系电话'},
                     {prop: 'supplierLevel', label: '供应商等级'},
+                    {prop: 'contactPhone', label: '联系电话'},
+                    {prop: 'enterprise', label: '供应商性质'},
                     {prop: 'address', label: '地址'},
-                    {prop: 'status', label: '启用'},
+                    {prop: 'classification', label: '供应商类型'},
+                    {prop: 'bank', label: '开户行'},
+                    {prop: 'vatRegistrationNum', label: '纳税编号'},
+                    {prop: 'bankAccount', label: '银行账户'},
+                    {prop: 'taxCode', label: '默认税码'},
+                    {prop: 'payable', label: '应付科目'},
+                    {prop: 'isPurchase', label: '是否采购'},
+                    {prop: 'prepaid', label: '预付科目'},
+                    {prop: 'isPayment', label: '是否付款'},
+                    {prop: 'status', label: '是否启用'},
+                    {prop: 'supplierSiteCode', label: '供应商地点'},
                 ],
                                 supplierLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"},{"fullName":"四级","id":"4"}],
                             supplierLevelProps:{"label":"fullName","value":"id"},
+                                enterpriseOptions:[{"fullName":"民营","id":"0"},{"fullName":"私营","id":"1"}],
+                            enterpriseProps:{"label":"fullName","value":"id"},
+                                classificationOptions:[{"fullName":"国内","id":"0"},{"fullName":"国外","id":"1"}],
+                            classificationProps:{"label":"fullName","value":"id"},
+                                taxCodeOptions:[{"fullName":"13个点","id":"0"},{"fullName":"9个点","id":"1"},{"fullName":"6个点","id":"2"},{"fullName":"5个点","id":"3"}],
+                            taxCodeProps:{"label":"fullName","value":"id"},
+                                isPurchaseOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
+                            isPurchaseProps:{"label":"fullName","value":"id"},
+                                isPaymentOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
+                            isPaymentProps:{"label":"fullName","value":"id"},
+                                statusOptions:[{"fullName":"启用","id":"1"},{"fullName":"停用","id":"2"}],
+                            statusProps:{"label":"fullName","value":"id"},
             }
         },
         computed: {
@@ -170,7 +261,7 @@ width="150" >
                     menuId:this.menuId
                 };
                 request({
-                    url: `/api/supplier/Supplier/getList`,
+                    url: `/api/example/Supplier/getList`,
                     method: 'post',
                     data: _query
                 }).then(res => {
@@ -190,7 +281,7 @@ width="150" >
                     type: 'warning'
                 }).then(() => {
                     request({
-                        url: `/api/supplier/Supplier/${id}`,
+                        url: `/api/example/Supplier/${id}`,
                         method: 'DELETE'
                     }).then(res => {
                         this.$message({
@@ -222,7 +313,7 @@ width="150" >
                         type: 'warning'
                     }).then(() => {
                         request({
-                            url: `/api/supplier/Supplier/batchRemove/${ids}`,
+                            url: `/api/example/Supplier/batchRemove/${ids}`,
                             method: 'DELETE'
                         }).then(res => {
                             this.$message({
@@ -251,7 +342,7 @@ width="150" >
             download(data) {
                 let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
                 request({
-                    url: `/api/supplier/Supplier/Actions/Export`,
+                    url: `/api/example/Supplier/Actions/Export`,
                     method: 'GET',
                     data: query
                 }).then(res => {
@@ -266,7 +357,7 @@ width="150" >
                         currentPage: 1,
                         pageSize: 20,
                     sort: "desc",
-                    sidx: "supplierCode",
+                    sidx: "creatorTime",
                 }
                 this.initData()
             },

SC-web/src/views/scm/basicInformation/tradeupload/index.vue

@@ -1,6 +1,7 @@
 <template>
     <div class="JNPF-common-layout">
 
+<<<<<<< HEAD
         <div class="JNPF-common-layout-center">
             <el-row class="JNPF-common-search-box" :gutter="16">
                 <el-form @submit.native.prevent>
@@ -103,6 +104,116 @@ width="150" >
         <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
         <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
     </div>
+=======
+		<div class="JNPF-common-layout-center">
+			<el-row class="JNPF-common-search-box" :gutter="16">
+				<el-form @submit.native.prevent>
+					<el-col :span="6">
+						<el-form-item label="物料名称">
+							<el-input v-model="query.materialName" placeholder="请输入" clearable> </el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item>
+							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+							<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
+						</el-form-item>
+					</el-col>
+				</el-form>
+			</el-row>
+			<div class="JNPF-common-layout-main JNPF-flex-main">
+				<div class="JNPF-common-head">
+					<div>
+						<el-button type="text" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+						</el-button>
+						<el-button type="text" icon="el-icon-download" @click="exportData()">导出
+						</el-button>
+						<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+						</el-button>
+					</div>
+					<div class="JNPF-common-head-right">
+						<el-tooltip effect="dark" content="刷新" placement="top">
+							<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+								@click="reset()" />
+						</el-tooltip>
+						<screenfull isContainer />
+					</div>
+				</div>
+				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
+					@selection-change="handleSelectionChange" border>
+          <el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
+					<el-table-column prop="licenseNo" label="车号" fixed="left" sortable width="120" align="center" />
+					<el-table-column prop="materialName" label="物料名称" fixed="left" sortable sortable width="150" align="center" />
+					<el-table-column prop="grossWeight" label="毛重" width="100" sortable align="center" />
+					<el-table-column prop="tareWeight" label="皮重" width="100" sortable align="center" />
+					<el-table-column prop="buckleWeight" label="扣重" width="100" sortable align="center" />
+					<el-table-column prop="netWeight" label="净重" width="100" sortable align="center" />
+					<el-table-column prop="driverName" label="司机名称" width="120" sortable align="center" />
+					<el-table-column prop="customerName" label="客户名称" width="150" sortable align="center" />
+					<el-table-column prop="salesName" label="销售合同" width="150" sortable align="center" />
+          <el-table-column prop="advance" label="是否垫资" width="120" sortable align="center" >
+						<template slot-scope="scope">
+							{{ scope.row.advance | dynamicText(advanceOptions) }}
+						</template>
+					</el-table-column>
+          <el-table-column prop="transportType" label="运输方式" sortable width="100" align="center" >
+						<template slot-scope="scope">
+							{{ scope.row.transportType | dynamicText(transportTypeOptions) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="departmentId" label="运费" sortable width="100" align="center" />
+					<el-table-column prop="salesPrice" label="销售价格" sortable width="100" align="center" />
+					<el-table-column prop="creatorusername" label="制单人" sortable width="150" align="center" />
+					<el-table-column prop="businessName" label="业务员" sortable width="150" align="center" />
+					<el-table-column prop="remark" label="备注" sortable width="150" align="center" />
+					<el-table-column prop="poundPictures" label="磅单图片" width="150" align="center">
+						<template slot-scope="scope">
+							<span v-for="(item,index) in JSON.parse(scope.row.poundPictures)" :key="index">
+								<el-popover placement="bottom" trigger="click" width="1000">
+									<img :src="`/dev${item.url}`" width="100%" />
+									<img
+										slot="reference"
+										:src="`/dev${item.url}`"
+										:alt="`/dev${item.url}`"
+										style="max-height: 70px;max-width: 70px; padding: 5px"
+									/>
+								</el-popover>
+							</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="vehiclePictures" label="车辆图片" width="150" align="center">
+						<template slot-scope="scope">
+							<span v-for="(item,index) in JSON.parse(scope.row.vehiclePictures)" :key="index">
+								<el-popover placement="bottom" trigger="click" width="1000">
+									<img :src="`/dev${item.url}`" width="100%" />
+									<img
+										slot="reference"
+										:src="`/dev${item.url}`"
+										:alt="`/dev${item.url}`"
+										style="max-height: 70px;max-width: 70px; padding: 5px"
+									/>
+								</el-popover>
+							</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" fixed="right" width="100" align="center">
+						<template slot-scope="scope">
+							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
+							</el-button>
+							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+							</el-button>
+						</template>
+					</el-table-column>
+				</JNPF-table>
+				<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+					@pagination="initData" />
+			</div>
+		</div>
+		<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
+		<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
+		<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
+	</div>
+>>>>>>> ddaf1c11476266e400901543653df705c0f58f87
 </template>
 
 <script>

SC-web/src/views/scm/basicInformation/vehicle/Form.vue

@@ -22,8 +22,8 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="24">
-						<el-form-item label="司机" prop="drivername">
-							<el-input v-model="dataForm.drivername" placeholder="请输入司机" clearable
+						<el-form-item label="司机名称" prop="drivername">
+							<el-input v-model="dataForm.drivername" placeholder="请输入司机名称" clearable
 								:style='{"width":"100%"}'>
 
 							</el-input>
@@ -89,7 +89,7 @@
 				isDetail: false,
 				dataForm: {
 					ticketno: '',
-					drivername: ' ',
+					drivername: '',
 					contact: '',
 					vehiclephotos: [{
 						"name": "006-1 (3).jpg",
@@ -114,7 +114,11 @@
 						message: '请输入司机名称',
 						trigger: 'blur'
 					}, ],
-
+          vehiclephotos: [{
+            required: true,
+            message: '请输入车辆照片',
+            trigger: 'blur'
+          }, ],
 
           contact: [{ required: true, message: '手机号不能为空' },
             { type: 'number',
@@ -129,15 +133,9 @@
                 }
               }
             }],
-        vehiclephotos: [{
-          required: true,
-          message: '请输入车辆图片',
-          trigger: 'blur'
-        }, ],
 
 				},
 
-
 			}
 		},
 		computed: {},
@@ -231,7 +229,6 @@
 				_dataAll.vehiclephotos = JSON.parse(_dataAll.vehiclephotos)
 				this.dataForm = _dataAll
 			},
-     
 		},
 	}
 </script>

SC-web/src/views/scm/basicInformation/vehicle/index.vue

@@ -41,7 +41,7 @@
 					</div>
 				</div>
 				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
-					@selection-change="handleSelectionChange">
+					@selection-change="handleSelectionChange" >
 					  <el-table-column prop="id" label="ID" width="0" align="left" />
 					<el-table-column prop="ticketno" label="车牌号" width="0" align="left" />
 					<el-table-column prop="drivername" label="司机" width="0" align="left" />