Merge remote-tracking branch 'origin/main'

SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java

@@ -157,6 +157,7 @@ public class CollectionController {
         String mainId =RandomUtil.uuId();
         UserInfo userInfo=userProvider.get();
         collectionCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false));
+        collectionCrForm.setCreatorUserName(userInfo.getUserId());
         CollectionEntity entity = JsonUtil.getJsonToBean(collectionCrForm, CollectionEntity.class);
 				entity.setId(mainId);
                 collectionService.save(entity);

SC-boot/linkage-scm/src/main/java/jnpf/customer/entity/CustomerEntity.java

@@ -109,10 +109,10 @@ public class CustomerEntity  {
     @TableField("PROVINCE")
     private String province;
 
-    @TableField("CITY")
-    private String city;
+//    @TableField("CITY")
+//    private String city;
 
-    @TableField("COUNTY")
-    private String county;
+//    @TableField("COUNTY")
+//    private String county;
 
 }

SC-boot/linkage-scm/src/main/java/jnpf/customer/entity/CustomerMobileEntity.java

@@ -101,12 +101,12 @@ public class CustomerMobileEntity {
 
     @TableField("PROVINCE")
     private String province;
+//
+//    @TableField("CITY")
+//    private String city;
 
-    @TableField("CITY")
-    private String city;
-
-    @TableField("COUNTY")
-    private String county;
+//    @TableField("COUNTY")
+//    private String county;
 
     private BigDecimal settlemenSum;
 

SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java

@@ -182,6 +182,7 @@ public class PurchaseorderController {
         purchaseorderCrForm.setCreatorTime(DateUtil.getNow());
         PurchaseorderitemEntity entity = JsonUtil.getJsonToBean(purchaseorderCrForm, PurchaseorderitemEntity.class);
 				entity.setId(mainId);
+				entity.setStatus(null);
                 purchaseorderitemService.save(entity);
                 List<Purchaseorder_item0Entity> Purchaseorder_item0List = JsonUtil.getJsonToList(purchaseorderCrForm.getPurchaseorder_item0List(),Purchaseorder_item0Entity.class);
                 for(Purchaseorder_item0Entity entitys : Purchaseorder_item0List){

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java

@@ -52,7 +52,7 @@ import jnpf.util.enums.FileTypeEnum;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-09
+ * @日期： 2023-02-16
  */
 @Slf4j
 @RestController
@@ -81,20 +81,25 @@ public class TradeuploadController {
      * @param tradeuploadPagination
      * @return
      */
-    @ApiOperation("贸易上传")
 	@PostMapping("/getList")
     public ActionResult list(@RequestBody TradeuploadPagination tradeuploadPagination)throws IOException{
         List<TradeuploadEntity> list= tradeuploadService.getList(tradeuploadPagination);
         //处理id字段转名称，若无需转或者为空可删除
     for(TradeuploadEntity entity:list){
-						Map<String,Object> materialCodeMap = new HashMap<>();
-        entity.setMaterialCode(generaterSwapUtil.getPopupSelectValue("381037852907038533","item_code","item_code",entity.getMaterialCode(),materialCodeMap));
-        Map<String,Object> salesNameMap = new HashMap<>();
-        entity.setSalesName(generaterSwapUtil.getPopupSelectValue("381038993740949317","contract_name","contract_name",entity.getSalesName(),salesNameMap));
-        Map<String,Object> licenseNoMap = new HashMap<>();
-        entity.setLicenseNo(generaterSwapUtil.getPopupSelectValue("381432451370615173","ticketno","ticketno",entity.getLicenseNo(),licenseNoMap));
             entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures()));
+						Map<String,Object> materialIdMap = new HashMap<>();
+            entity.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","description",entity.getMaterialId(),materialIdMap));
+						Map<String,Object> customerIdMap = new HashMap<>();
+            entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap));
+						Map<String,Object> salesIdMap = new HashMap<>();
+            entity.setSalesId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","contract_name",entity.getSalesId(),salesIdMap));
+						Map<String,Object> vehicleIdMap = new HashMap<>();
+            entity.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getVehicleId(),vehicleIdMap));
             entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures()));
+						Map<String,Object> creatorUserNameMap = new HashMap<>();
+            entity.setCreatorUserName(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_RealName","F_RealName",entity.getCreatorUserName(),creatorUserNameMap));
+						Map<String,Object> naturalIdMap = new HashMap<>();
+            entity.setNaturalId(generaterSwapUtil.getPopupSelectValue("395933800510599301","id","name",entity.getNaturalId(),naturalIdMap));
     }
 	List<TradeuploadListVO> listVO=JsonUtil.getJsonToList(list,TradeuploadListVO.class);
     for(TradeuploadListVO tradeuploadVO:listVO){
@@ -120,6 +125,7 @@ public class TradeuploadController {
     public ActionResult create(@RequestBody @Valid TradeuploadCrForm tradeuploadCrForm) throws DataException {
         String mainId =RandomUtil.uuId();
         UserInfo userInfo=userProvider.get();
+        tradeuploadCrForm.setCreatorTime(DateUtil.getNow());
         TradeuploadEntity entity = JsonUtil.getJsonToBean(tradeuploadCrForm, TradeuploadEntity.class);
 				entity.setId(mainId);
                 tradeuploadService.save(entity);
@@ -163,14 +169,20 @@ public class TradeuploadController {
         List<TradeuploadEntity> list=  tradeuploadService.getTypeList(tradeuploadPagination,tradeuploadPaginationExportModel.getDataType());
         //处理id字段转名称，若无需转或者为空可删除
     for(TradeuploadEntity entity:list){
-						Map<String,Object> materialCodeMap = new HashMap<>();
-            entity.setMaterialCode(generaterSwapUtil.swapRelationFormValue("selectField121",entity.getMaterialCode(),"294090217084722181",materialCodeMap));
-						Map<String,Object> salesNameMap = new HashMap<>();
-            entity.setSalesName(generaterSwapUtil.swapRelationFormValue("selectField121",entity.getSalesName(),"294090217084722181",salesNameMap));
-						Map<String,Object> licenseNoMap = new HashMap<>();
-            entity.setLicenseNo(generaterSwapUtil.swapRelationFormValue("selectField122",entity.getLicenseNo(),"294090217084722181",licenseNoMap));
             entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures()));
+						Map<String,Object> materialIdMap = new HashMap<>();
+            entity.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","description",entity.getMaterialId(),materialIdMap));
+						Map<String,Object> customerIdMap = new HashMap<>();
+            entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap));
+						Map<String,Object> salesIdMap = new HashMap<>();
+            entity.setSalesId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","contract_name",entity.getSalesId(),salesIdMap));
+						Map<String,Object> vehicleIdMap = new HashMap<>();
+            entity.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",entity.getVehicleId(),vehicleIdMap));
             entity.setVehiclePictures(generaterSwapUtil.getFileNameInJson(entity.getVehiclePictures()));
+						Map<String,Object> creatorUserNameMap = new HashMap<>();
+            entity.setCreatorUserName(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_RealName","F_RealName",entity.getCreatorUserName(),creatorUserNameMap));
+						Map<String,Object> naturalIdMap = new HashMap<>();
+            entity.setNaturalId(generaterSwapUtil.getPopupSelectValue("395933800510599301","id","name",entity.getNaturalId(),naturalIdMap));
     }
 	List<TradeuploadListVO> listVO=JsonUtil.getJsonToList(list,TradeuploadListVO.class);
     for(TradeuploadListVO tradeuploadVO:listVO){
@@ -190,38 +202,29 @@ public class TradeuploadController {
             if(keys.length>0){
                 for(String key:keys){
                     switch(key){
-                    case "materialCode" :
-                    entitys.add(new ExcelExportEntity("物料编码" ,"materialCode"));
-                    break;
-                    case "materialName" :
-                    entitys.add(new ExcelExportEntity("物料名称" ,"materialName"));
-                    break;
-                    case "salesName" :
-                    entitys.add(new ExcelExportEntity("销售合同" ,"salesName"));
+                    case "poundPictures" :
+                    entitys.add(new ExcelExportEntity("磅单上传" ,"poundPictures"));
                     break;
-                    case "customerName" :
-                    entitys.add(new ExcelExportEntity("客户名称" ,"customerName"));
+                    case "materialId" :
+                    entitys.add(new ExcelExportEntity("物料名称" ,"materialId"));
                     break;
-                    case "advance" :
-                    entitys.add(new ExcelExportEntity("是否垫资" ,"advance"));
+                    case "customerId" :
+                    entitys.add(new ExcelExportEntity("客户名称" ,"customerId"));
                     break;
-                    case "salesPrice" :
-                    entitys.add(new ExcelExportEntity("销售价格" ,"salesPrice"));
+                    case "salesId" :
+                    entitys.add(new ExcelExportEntity("销售合同" ,"salesId"));
                     break;
-                    case "transportType" :
-                    entitys.add(new ExcelExportEntity("运输方式" ,"transportType"));
+                    case "vehicleId" :
+                    entitys.add(new ExcelExportEntity("车牌号" ,"vehicleId"));
                     break;
-                    case "transportPrice" :
-                    entitys.add(new ExcelExportEntity("运费" ,"transportPrice"));
+                    case "vehiclePictures" :
+                    entitys.add(new ExcelExportEntity("车辆图片" ,"vehiclePictures"));
                     break;
-                    case "licenseNo" :
-                    entitys.add(new ExcelExportEntity("车号" ,"licenseNo"));
+                    case "poundDate" :
+                    entitys.add(new ExcelExportEntity("磅单时间" ,"poundDate"));
                     break;
-                    case "businessName" :
-                    entitys.add(new ExcelExportEntity("业务员名称" ,"businessName"));
-                    break;
-                    case "poundPictures" :
-                    entitys.add(new ExcelExportEntity("磅单图片" ,"poundPictures"));
+                    case "poundlistNo" :
+                    entitys.add(new ExcelExportEntity("磅单号" ,"poundlistNo"));
                     break;
                     case "tareWeight" :
                     entitys.add(new ExcelExportEntity("皮重" ,"tareWeight"));
@@ -235,17 +238,32 @@ public class TradeuploadController {
                     case "netWeight" :
                     entitys.add(new ExcelExportEntity("净重" ,"netWeight"));
                     break;
-                    case "remark" :
-                    entitys.add(new ExcelExportEntity("备注" ,"remark"));
+                    case "unit" :
+                    entitys.add(new ExcelExportEntity("单位 " ,"unit"));
                     break;
-                    case "driverName" :
-                    entitys.add(new ExcelExportEntity("司机名称" ,"driverName"));
+                    case "transportType" :
+                    entitys.add(new ExcelExportEntity("运输类型" ,"transportType"));
                     break;
-                    case "vehiclePictures" :
-                    entitys.add(new ExcelExportEntity("车辆图片" ,"vehiclePictures"));
+                    case "advance" :
+                    entitys.add(new ExcelExportEntity("是否垫资" ,"advance"));
+                    break;
+                    case "transportPrice" :
+                    entitys.add(new ExcelExportEntity("运费" ,"transportPrice"));
+                    break;
+                    case "salesPrice" :
+                    entitys.add(new ExcelExportEntity("销售价格" ,"salesPrice"));
                     break;
                     case "creatorUserName" :
-                    entitys.add(new ExcelExportEntity("制单人" ,"creatorUserName"));
+                    entitys.add(new ExcelExportEntity("业务员" ,"creatorUserName"));
+                    break;
+                    case "naturalId" :
+                    entitys.add(new ExcelExportEntity("自然人" ,"naturalId"));
+                    break;
+                    case "remark" :
+                    entitys.add(new ExcelExportEntity("备注" ,"remark"));
+                    break;
+                    case "creatorTime" :
+                    entitys.add(new ExcelExportEntity("磅单日期" ,"creatorTime"));
                     break;
             default:
                     break;
@@ -310,6 +328,9 @@ public class TradeuploadController {
     public ActionResult<TradeuploadInfoVO> info(@PathVariable("id") String id){
         TradeuploadEntity entity= tradeuploadService.getInfo(id);
         TradeuploadInfoVO vo=JsonUtil.getJsonToBean(entity, TradeuploadInfoVO.class);
+        if(vo.getCreatorTime()!=null){
+            vo.setCreatorTime(vo.getCreatorTime());
+        }
 
     //子表
     //副表
@@ -332,14 +353,20 @@ public class TradeuploadController {
  //附表数据转换
 
 //添加到详情表单对象中
-						Map<String,Object> materialCodeMap = new HashMap<>();
-            vo.setMaterialCode(generaterSwapUtil.swapRelationFormValue("selectField121",vo.getMaterialCode(),"294090217084722181",materialCodeMap));
-						Map<String,Object> salesNameMap = new HashMap<>();
-            vo.setSalesName(generaterSwapUtil.swapRelationFormValue("selectField121",vo.getSalesName(),"294090217084722181",salesNameMap));
-						Map<String,Object> licenseNoMap = new HashMap<>();
-            vo.setLicenseNo(generaterSwapUtil.swapRelationFormValue("selectField122",vo.getLicenseNo(),"294090217084722181",licenseNoMap));
             vo.setPoundPictures(generaterSwapUtil.getFileNameInJson(vo.getPoundPictures()));
+						Map<String,Object> materialIdMap = new HashMap<>();
+            vo.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","description",vo.getMaterialId(),materialIdMap));
+						Map<String,Object> customerIdMap = new HashMap<>();
+            vo.setCustomerId(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",vo.getCustomerId(),customerIdMap));
+						Map<String,Object> salesIdMap = new HashMap<>();
+            vo.setSalesId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","contract_name",vo.getSalesId(),salesIdMap));
+						Map<String,Object> vehicleIdMap = new HashMap<>();
+            vo.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",vo.getVehicleId(),vehicleIdMap));
             vo.setVehiclePictures(generaterSwapUtil.getFileNameInJson(vo.getVehiclePictures()));
+						Map<String,Object> creatorUserNameMap = new HashMap<>();
+            vo.setCreatorUserName(generaterSwapUtil.getPopupSelectValue("ebcc44be142e43b795c0d769abd6d25a","F_RealName","F_RealName",vo.getCreatorUserName(),creatorUserNameMap));
+						Map<String,Object> naturalIdMap = new HashMap<>();
+            vo.setNaturalId(generaterSwapUtil.getPopupSelectValue("395933800510599301","id","name",vo.getNaturalId(),naturalIdMap));
 
         return ActionResult.success(vo);
 		}
@@ -360,6 +387,7 @@ public class TradeuploadController {
         TradeuploadEntity entity= tradeuploadService.getInfo(id);
         if(entity!=null){
             TradeuploadEntity subentity=JsonUtil.getJsonToBean(tradeuploadUpForm, TradeuploadEntity.class);
+					subentity.setCreatorTime(entity.getCreatorTime());
             tradeuploadService.update(id, subentity);
         return ActionResult.success("更新成功");
         }else{
@@ -391,4 +419,9 @@ public class TradeuploadController {
 
 
 
+
+
+
+
+
 }

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/entity/TradeuploadEntity.java

@@ -24,7 +24,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-09
+ * @日期： 2023-02-16
  */
 @Data
 @TableName("jg_poundlist")
@@ -34,34 +34,34 @@ public class TradeuploadEntity  {
     private String id;
 
     @TableField("CREATOR_USER_ID")
-    private String creatoruserid;
+    private String creatorUserId;
 
     @TableField("CREATOR_USER_NAME")
-    private String creatorusername;
+    private String creatorUserName;
 
     @TableField("CREATOR_TIME")
-    private Date creatortime;
+    private Date creatorTime;
 
     @TableField("LAST_MODIFY_USER_ID")
-    private String lastmodifyuserid;
+    private String lastModifyUserId;
 
     @TableField("LAST_MODIFY_USER_NAME")
-    private String lastmodifyusername;
+    private String lastModifyUserName;
 
     @TableField("LAST_MODIFY_TIME")
-    private Date lastmodifytime;
+    private Date lastModifyTime;
 
     @TableField("DELETE_USER_ID")
-    private String deleteuserid;
+    private String deleteUserId;
 
     @TableField("DELETE_USER_NAME")
-    private String deleteusername;
+    private String deleteUserName;
 
     @TableField("DELETE_TIME")
-    private Date deletetime;
+    private Date deleteTime;
 
     @TableField("DELETE_MARK")
-    private String deletemark;
+    private String deleteMark;
 
     @TableField("ORGNIZE_ID")
     private String orgnizeId;
@@ -69,38 +69,23 @@ public class TradeuploadEntity  {
     @TableField("DEPARTMENT_ID")
     private String departmentId;
 
-    @TableField("LICENSE_NO")
-    private String licenseNo;
+    @TableField("CUSTOMER_ID")
+    private String customerId;
 
-    @TableField("CUSTOMER_CODE")
-    private String customerCode;
+    @TableField("SALES_ID")
+    private String salesId;
 
-    @TableField("CUSTOMER_NAME")
-    private String customerName;
-
-    @TableField("SALES_CODE")
-    private String salesCode;
-
-    @TableField("SALES_NAME")
-    private String salesName;
-
-    @TableField("SUPPLIER_CODE")
-    private String supplierCode;
+    @TableField("SUPPLIER_ID")
+    private String supplierId;
 
     @TableField("SUPPLIER_NAME")
     private String supplierName;
 
-    @TableField("PURCHASE_CODE")
-    private String purchaseCode;
-
-    @TableField("PURCHASE_NAME")
-    private String purchaseName;
+    @TableField("PURCHASE_ID")
+    private String purchaseId;
 
-    @TableField("MATERIAL_CODE")
-    private String materialCode;
-
-    @TableField("MATERIAL_NAME")
-    private String materialName;
+    @TableField("MATERIAL_ID")
+    private String materialId;
 
     @TableField("ADVANCE")
     private String advance;
@@ -144,11 +129,8 @@ public class TradeuploadEntity  {
     @TableField("POUND_DATE")
     private Date poundDate;
 
-    @TableField("BUSINESS_CODE")
-    private String businessCode;
-
-    @TableField("BUSINESS_NAME")
-    private String businessName;
+    @TableField("BUSINESS_ID")
+    private String businessId;
 
     @TableField("POUND_PICTURES")
     private String poundPictures;
@@ -156,9 +138,6 @@ public class TradeuploadEntity  {
     @TableField("VEHICLE_PICTURES")
     private String vehiclePictures;
 
-    @TableField("DRIVER_NAME")
-    private String driverName;
-
     @TableField("POUND_TYPE")
     private String poundType;
 
@@ -180,4 +159,31 @@ public class TradeuploadEntity  {
     @TableField("TRANSPORT_PRICE")
     private BigDecimal transportPrice;
 
+    @TableField("ORIGIN_PLACE")
+    private String originPlace;
+
+    @TableField("NATURAL_ID")
+    private String naturalId;
+
+    @TableField("POUNDLIST_NO")
+    private String poundlistNo;
+
+    @TableField("VEHICLE_ID")
+    private String vehicleId;
+
+    @TableField("IS_EXAMINE")
+    private String isExamine;
+
+    @TableField("IS_INVOICING")
+    private String isInvoicing;
+
+    @TableField("IS_PAY")
+    private String isPay;
+
+    @TableField("IS_COLLECTION")
+    private String isCollection;
+
+    @TableField("IS_EXPENSE")
+    private String isExpense;
+
 }

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-09
+ * 日期： 2023-02-16
  */
 public interface TradeuploadMapper extends BaseMapper<TradeuploadEntity> {
 

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadCrForm.java

@@ -14,87 +14,95 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-09
+ * @日期： 2023-02-16
  */
 @Data
 public class TradeuploadCrForm  {
 
-    /** 物料编码 **/
-    @JsonProperty("materialCode")
-    private String materialCode;
+    /** 磅单上传 **/
+    @JsonProperty("poundPictures")
+    private String poundPictures;
 
     /** 物料名称 **/
-    @JsonProperty("materialName")
-    private String materialName;
-
-    /** 销售合同 **/
-    @JsonProperty("salesName")
-    private String salesName;
+    @JsonProperty("materialId")
+    private String materialId;
 
     /** 客户名称 **/
-    @JsonProperty("customerName")
-    private String customerName;
-
-    /** 是否垫资 **/
-    @JsonProperty("advance")
-    private String advance;
-
-    /** 销售价格 **/
-    @JsonProperty("salesPrice")
-    private Integer salesPrice;
+    @JsonProperty("customerId")
+    private String customerId;
 
-    /** 运输方式 **/
-    @JsonProperty("transportType")
-    private String transportType;
+    /** 销售合同 **/
+    @JsonProperty("salesId")
+    private String salesId;
 
-    /** 运费 **/
-    @JsonProperty("transportPrice")
-    private Integer transportPrice;
+    /** 车牌号 **/
+    @JsonProperty("vehicleId")
+    private String vehicleId;
 
-    /** 车号 **/
-    @JsonProperty("licenseNo")
-    private String licenseNo;
+    /** 车辆图片 **/
+    @JsonProperty("vehiclePictures")
+    private String vehiclePictures;
 
-    /** 业务员名称 **/
-    @JsonProperty("businessName")
-    private String businessName;
+    /** 磅单时间 **/
+    @JsonProperty("poundDate")
+    private Long  poundDate;
 
-    /** 磅单图片 **/
-    @JsonProperty("poundPictures")
-    private String poundPictures;
+    /** 磅单号 **/
+    @JsonProperty("poundlistNo")
+    private String poundlistNo;
 
     /** 皮重 **/
     @JsonProperty("tareWeight")
-    private Integer tareWeight;
+    private String tareWeight;
 
     /** 毛重 **/
     @JsonProperty("grossWeight")
-    private Integer grossWeight;
+    private String grossWeight;
 
     /** 扣重 **/
     @JsonProperty("buckleWeight")
-    private Integer buckleWeight;
+    private String buckleWeight;
 
     /** 净重 **/
     @JsonProperty("netWeight")
-    private Integer netWeight;
+    private String netWeight;
 
-    /** 备注 **/
-    @JsonProperty("remark")
-    private String remark;
+    /** 单位  **/
+    @JsonProperty("unit")
+    private String unit;
 
-    /** 司机名称 **/
-    @JsonProperty("driverName")
-    private String driverName;
+    /** 运输类型 **/
+    @JsonProperty("transportType")
+    private String transportType;
 
-    /** 车辆图片 **/
-    @JsonProperty("vehiclePictures")
-    private String vehiclePictures;
+    /** 是否垫资 **/
+    @JsonProperty("advance")
+    private String advance;
+
+    /** 运费 **/
+    @JsonProperty("transportPrice")
+    private String transportPrice;
+
+    /** 销售价格 **/
+    @JsonProperty("salesPrice")
+    private String salesPrice;
 
-    /** 制单人 **/
+    /** 业务员 **/
     @JsonProperty("creatorUserName")
     private String creatorUserName;
 
+    /** 自然人 **/
+    @JsonProperty("naturalId")
+    private String naturalId;
+
+    /** 备注 **/
+    @JsonProperty("remark")
+    private String remark;
+
+    /** 磅单日期 **/
+    @JsonProperty("creatorTime")
+    private String creatorTime;
+
 
 
 }

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadInfoVO.java

@@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-09
+ * @日期： 2023-02-16
  */
 @Data
 public class TradeuploadInfoVO{
@@ -23,80 +23,89 @@ public class TradeuploadInfoVO{
         @JsonProperty("id")
         private String id;
 
-        /** 物料编码 **/
-        @JsonProperty("materialCode")
-        private String materialCode;
+        /** 磅单上传 **/
+        @JsonProperty("poundPictures")
+        private String poundPictures;
 
         /** 物料名称 **/
-        @JsonProperty("materialName")
-        private String materialName;
-
-        /** 销售合同 **/
-        @JsonProperty("salesName")
-        private String salesName;
+        @JsonProperty("materialId")
+        private String materialId;
 
         /** 客户名称 **/
-        @JsonProperty("customerName")
-        private String customerName;
-
-        /** 是否垫资 **/
-        @JsonProperty("advance")
-        private String advance;
-
-        /** 销售价格 **/
-        @JsonProperty("salesPrice")
-        private Integer salesPrice;
+        @JsonProperty("customerId")
+        private String customerId;
 
-        /** 运输方式 **/
-        @JsonProperty("transportType")
-        private String transportType;
+        /** 销售合同 **/
+        @JsonProperty("salesId")
+        private String salesId;
 
-        /** 运费 **/
-        @JsonProperty("transportPrice")
-        private Integer transportPrice;
+        /** 车牌号 **/
+        @JsonProperty("vehicleId")
+        private String vehicleId;
 
-        /** 车号 **/
-        @JsonProperty("licenseNo")
-        private String licenseNo;
+        /** 车辆图片 **/
+        @JsonProperty("vehiclePictures")
+        private String vehiclePictures;
 
-        /** 业务员名称 **/
-        @JsonProperty("businessName")
-        private String businessName;
+        /** 磅单时间 **/
+        @JsonProperty("poundDate")
+        private Long  poundDate;
 
-        /** 磅单图片 **/
-        @JsonProperty("poundPictures")
-        private String poundPictures;
+        /** 磅单号 **/
+        @JsonProperty("poundlistNo")
+        private String poundlistNo;
 
         /** 皮重 **/
         @JsonProperty("tareWeight")
-        private Integer tareWeight;
+        private String tareWeight;
 
         /** 毛重 **/
         @JsonProperty("grossWeight")
-        private Integer grossWeight;
+        private String grossWeight;
 
         /** 扣重 **/
         @JsonProperty("buckleWeight")
-        private Integer buckleWeight;
+        private String buckleWeight;
 
         /** 净重 **/
         @JsonProperty("netWeight")
-        private Integer netWeight;
+        private String netWeight;
 
-        /** 备注 **/
-        @JsonProperty("remark")
-        private String remark;
+        /** 单位  **/
+        @JsonProperty("unit")
+        private String unit;
 
-        /** 司机名称 **/
-        @JsonProperty("driverName")
-        private String driverName;
+        /** 运输类型 **/
+        @JsonProperty("transportType")
+        private String transportType;
 
-        /** 车辆图片 **/
-        @JsonProperty("vehiclePictures")
-        private String vehiclePictures;
+        /** 是否垫资 **/
+        @JsonProperty("advance")
+        private String advance;
+
+        /** 运费 **/
+        @JsonProperty("transportPrice")
+        private String transportPrice;
+
+        /** 销售价格 **/
+        @JsonProperty("salesPrice")
+        private String salesPrice;
 
-        /** 制单人 **/
+        /** 业务员 **/
         @JsonProperty("creatorUserName")
         private String creatorUserName;
 
+        /** 自然人 **/
+        @JsonProperty("naturalId")
+        private String naturalId;
+
+        /** 备注 **/
+        @JsonProperty("remark")
+        private String remark;
+
+        /** 磅单日期 **/
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+        @JsonProperty("creatorTime")
+        private Date  creatorTime;
+
 }

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadListQuery.java

@@ -10,13 +10,16 @@ import java.util.List;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-09
+ * @日期： 2023-02-16
  */
 @Data
 public class TradeuploadListQuery extends Pagination {
 
-        /** 物料名称 */
-        private String materialName;
+        /** 磅单时间 */
+        private List<String> poundDate;
+
+        /** 磅单号 */
+        private String poundlistNo;
 	/**
     * 菜单id
     */

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadListVO.java

@@ -15,7 +15,7 @@ import java.math.BigDecimal;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-09
+ * @日期： 2023-02-16
  */
 @Data
 public class TradeuploadListVO{
@@ -24,93 +24,111 @@ public class TradeuploadListVO{
     private String id;
 
 
-    /** 物料编码 **/
-    @JsonProperty("materialCode")
-    private String materialCode;
+    /** 磅单上传 **/
+    @JsonProperty("poundPictures")
+    private String poundPictures;
 
 
     /** 物料名称 **/
-    @JsonProperty("materialName")
-    private String materialName;
-
-
-    /** 销售合同 **/
-    @JsonProperty("salesName")
-    private String salesName;
+    @JsonProperty("materialId")
+    private String materialId;
 
 
     /** 客户名称 **/
-    @JsonProperty("customerName")
-    private String customerName;
-
+    @JsonProperty("customerId")
+    private String customerId;
 
-    /** 是否垫资 **/
-    @JsonProperty("advance")
-    private String advance;
 
+    /** 销售合同 **/
+    @JsonProperty("salesId")
+    private String salesId;
 
-    /** 销售价格 **/
-    @JsonProperty("salesPrice")
-    private Integer salesPrice;
 
-    /** 运输方式 **/
-    @JsonProperty("transportType")
-    private String transportType;
+    /** 车牌号 **/
+    @JsonProperty("vehicleId")
+    private String vehicleId;
 
 
-    /** 运费 **/
-    @JsonProperty("transportPrice")
-    private Integer transportPrice;
+    /** 车辆图片 **/
+    @JsonProperty("vehiclePictures")
+    private String vehiclePictures;
 
-    /** 车号 **/
-    @JsonProperty("licenseNo")
-    private String licenseNo;
 
+    /** 磅单时间 **/
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonProperty("poundDate")
+    private Date  poundDate;
 
-    /** 业务员名称 **/
-    @JsonProperty("businessName")
-    private String businessName;
 
-
-    /** 磅单图片 **/
-    @JsonProperty("poundPictures")
-    private String poundPictures;
+    /** 磅单号 **/
+    @JsonProperty("poundlistNo")
+    private String poundlistNo;
 
 
     /** 皮重 **/
     @JsonProperty("tareWeight")
-    private Integer tareWeight;
+    private String tareWeight;
+
 
     /** 毛重 **/
     @JsonProperty("grossWeight")
-    private Integer grossWeight;
+    private String grossWeight;
+
 
     /** 扣重 **/
     @JsonProperty("buckleWeight")
-    private Integer buckleWeight;
+    private String buckleWeight;
+
 
     /** 净重 **/
     @JsonProperty("netWeight")
-    private Integer netWeight;
+    private String netWeight;
 
-    /** 备注 **/
-    @JsonProperty("remark")
-    private String remark;
 
+    /** 单位  **/
+    @JsonProperty("unit")
+    private String unit;
 
-    /** 司机名称 **/
-    @JsonProperty("driverName")
-    private String driverName;
 
+    /** 运输类型 **/
+    @JsonProperty("transportType")
+    private String transportType;
 
-    /** 车辆图片 **/
-    @JsonProperty("vehiclePictures")
-    private String vehiclePictures;
+
+    /** 是否垫资 **/
+    @JsonProperty("advance")
+    private String advance;
+
+
+    /** 运费 **/
+    @JsonProperty("transportPrice")
+    private String transportPrice;
 
 
-    /** 制单人 **/
+    /** 销售价格 **/
+    @JsonProperty("salesPrice")
+    private String salesPrice;
+
+
+    /** 业务员 **/
     @JsonProperty("creatorUserName")
     private String creatorUserName;
 
 
+    /** 自然人 **/
+    @JsonProperty("naturalId")
+    private String naturalId;
+
+
+    /** 备注 **/
+    @JsonProperty("remark")
+    private String remark;
+
+
+    /** 磅单日期 **/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonProperty("creatorTime")
+    private Date  creatorTime;
+
+
 }

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPagination.java

@@ -11,13 +11,16 @@ import java.util.List;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-09
+ * @日期： 2023-02-16
  */
 @Data
 public class TradeuploadPagination extends Pagination {
 
-        /** 物料名称 */
-        private String materialName;
+        /** 磅单时间 */
+        private List<String> poundDate;
+
+        /** 磅单号 */
+        private String poundlistNo;
 	/**
     * 菜单id
     */

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPaginationExportModel.java

@@ -9,7 +9,7 @@ import java.util.*;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-09
+ * @日期： 2023-02-16
  */
 @Data
 public class TradeuploadPaginationExportModel extends Pagination {
@@ -21,6 +21,9 @@ public class TradeuploadPaginationExportModel extends Pagination {
     private String dataType;
 
 
-			/** 物料名称 */
-    private String materialName;
+			/** 磅单时间 */
+    private List<String> poundDate;
+
+			/** 磅单号 */
+    private String poundlistNo;
 }

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadUpForm.java

@@ -15,7 +15,7 @@ import lombok.Data;
  * @版本： V3.2.0
  * @版权： LINKAGE-BOOT
  * @作者： LINKAGE-BOOT研发团队
- * @日期： 2023-01-09
+ * @日期： 2023-02-16
  */
 @Data
 public class TradeuploadUpForm{
@@ -23,99 +23,109 @@ public class TradeuploadUpForm{
     private String id;
 
 
-    /** 物料编码 **/
-    @JsonProperty("materialCode")
-    private String materialCode;
+    /** 磅单上传 **/
+    @JsonProperty("poundPictures")
+    private String poundPictures;
 
 
     /** 物料名称 **/
-    @JsonProperty("materialName")
-    private String materialName;
-
-
-    /** 销售合同 **/
-    @JsonProperty("salesName")
-    private String salesName;
+    @JsonProperty("materialId")
+    private String materialId;
 
 
     /** 客户名称 **/
-    @JsonProperty("customerName")
-    private String customerName;
-
-
-    /** 是否垫资 **/
-    @JsonProperty("advance")
-    private String advance;
-
-
-    /** 销售价格 **/
-    @JsonProperty("salesPrice")
-    private Integer salesPrice;
+    @JsonProperty("customerId")
+    private String customerId;
 
 
-    /** 运输方式 **/
-    @JsonProperty("transportType")
-    private String transportType;
+    /** 销售合同 **/
+    @JsonProperty("salesId")
+    private String salesId;
 
 
-    /** 运费 **/
-    @JsonProperty("transportPrice")
-    private Integer transportPrice;
+    /** 车牌号 **/
+    @JsonProperty("vehicleId")
+    private String vehicleId;
 
 
-    /** 车号 **/
-    @JsonProperty("licenseNo")
-    private String licenseNo;
+    /** 车辆图片 **/
+    @JsonProperty("vehiclePictures")
+    private String vehiclePictures;
 
 
-    /** 业务员名称 **/
-    @JsonProperty("businessName")
-    private String businessName;
+    /** 磅单时间 **/
+    @JsonProperty("poundDate")
+    private Long  poundDate;
 
 
-    /** 磅单图片 **/
-    @JsonProperty("poundPictures")
-    private String poundPictures;
+    /** 磅单号 **/
+    @JsonProperty("poundlistNo")
+    private String poundlistNo;
 
 
     /** 皮重 **/
     @JsonProperty("tareWeight")
-    private Integer tareWeight;
+    private String tareWeight;
 
 
     /** 毛重 **/
     @JsonProperty("grossWeight")
-    private Integer grossWeight;
+    private String grossWeight;
 
 
     /** 扣重 **/
     @JsonProperty("buckleWeight")
-    private Integer buckleWeight;
+    private String buckleWeight;
 
 
     /** 净重 **/
     @JsonProperty("netWeight")
-    private Integer netWeight;
+    private String netWeight;
 
 
-    /** 备注 **/
-    @JsonProperty("remark")
-    private String remark;
+    /** 单位  **/
+    @JsonProperty("unit")
+    private String unit;
 
 
-    /** 司机名称 **/
-    @JsonProperty("driverName")
-    private String driverName;
+    /** 运输类型 **/
+    @JsonProperty("transportType")
+    private String transportType;
 
 
-    /** 车辆图片 **/
-    @JsonProperty("vehiclePictures")
-    private String vehiclePictures;
+    /** 是否垫资 **/
+    @JsonProperty("advance")
+    private String advance;
+
+
+    /** 运费 **/
+    @JsonProperty("transportPrice")
+    private String transportPrice;
 
 
-    /** 制单人 **/
+    /** 销售价格 **/
+    @JsonProperty("salesPrice")
+    private String salesPrice;
+
+
+    /** 业务员 **/
     @JsonProperty("creatorUserName")
     private String creatorUserName;
 
 
+    /** 自然人 **/
+    @JsonProperty("naturalId")
+    private String naturalId;
+
+
+    /** 备注 **/
+    @JsonProperty("remark")
+    private String remark;
+
+
+    /** 磅单日期 **/
+    @JsonProperty("creatorTime")
+    private String creatorTime;
+
+
 }

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/TradeuploadService.java

@@ -10,7 +10,7 @@ import java.util.*;
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-09
+ * 日期： 2023-02-16
  */
 public interface TradeuploadService extends IService<TradeuploadEntity> {
 

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java

@@ -38,7 +38,7 @@ import java.util.*;
  * 版本： V3.2.0
  * 版权： LINKAGE-BOOT
  * 作者： LINKAGE-BOOT研发团队
- * 日期： 2023-01-09
+ * 日期： 2023-02-16
  */
 @Service
 public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, TradeuploadEntity> implements TradeuploadService{
@@ -88,9 +88,20 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
 
 		}
     }
-			if(StringUtil.isNotEmpty(tradeuploadPagination.getMaterialName())){
+			if(StringUtil.isNotEmpty(tradeuploadPagination.getPoundDate())){
             tradeuploadNum++;
-            tradeuploadQueryWrapper.lambda().like(TradeuploadEntity::getMaterialName,tradeuploadPagination.getMaterialName());
+            List<String> PoundDateList =  tradeuploadPagination.getPoundDate();
+            Long fir = Long.valueOf(PoundDateList.get(0));
+            Long sec = Long.valueOf(PoundDateList.get(1));
+
+                tradeuploadQueryWrapper.lambda().ge(TradeuploadEntity::getPoundDate, new Date(fir))
+            .le(TradeuploadEntity::getPoundDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
+
+                    }
+
+			if(StringUtil.isNotEmpty(tradeuploadPagination.getPoundlistNo())){
+            tradeuploadNum++;
+            tradeuploadQueryWrapper.lambda().like(TradeuploadEntity::getPoundlistNo,tradeuploadPagination.getPoundlistNo());
                     }
 
         if(AllIdList.size()>0){
@@ -154,9 +165,20 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
 
 		}
     }
-			if(StringUtil.isNotEmpty(tradeuploadPagination.getMaterialName())){
+			if(StringUtil.isNotEmpty(tradeuploadPagination.getPoundDate())){
+            tradeuploadNum++;
+            List<String> PoundDateList =  tradeuploadPagination.getPoundDate();
+            Long fir = Long.valueOf(PoundDateList.get(0));
+            Long sec = Long.valueOf(PoundDateList.get(1));
+
+                tradeuploadQueryWrapper.lambda().ge(TradeuploadEntity::getPoundDate, new Date(fir))
+            .le(TradeuploadEntity::getPoundDate, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
+
+                    }
+
+			if(StringUtil.isNotEmpty(tradeuploadPagination.getPoundlistNo())){
             tradeuploadNum++;
-            tradeuploadQueryWrapper.lambda().like(TradeuploadEntity::getMaterialName,tradeuploadPagination.getMaterialName());
+            tradeuploadQueryWrapper.lambda().like(TradeuploadEntity::getPoundlistNo,tradeuploadPagination.getPoundlistNo());
                     }
 
 		if(AllIdList.size()>0){

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

@@ -1,6 +1,6 @@
 <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="1500px" >
 		<el-row :gutter="15" class="">
 			<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
 				label-position="right">

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

@@ -6,7 +6,7 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="区域名称">
-							<el-input v-model="query.mName" placeholder="请输入" clearable> </el-input>
+              <el-input v-model="query.mName" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -24,24 +24,29 @@
             </el-button>
             <el-button type="text" icon="el-icon-download" @click="exportData()">导出
             </el-button>
+            <el-button type="text" icon="el-icon-download" @click="">导入
+            </el-button>
+            <el-button type="text" icon="el-icon-download" @click="">编辑
+            </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()" />
+                       @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="mName" label="区域名称" width="0" align="left" />
-					<el-table-column prop="creatortime" label="创建时间" width="0" align="left" />
-					<el-table-column prop="creatorusername" label="创建人名称" width="0" align="left" />
-					<el-table-column prop="lastmodifytime" label="修改时间" width="0" align="left" />
-					<el-table-column prop="lastmodifyusername" 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="mName" label="区域名称" width="300" align="center"sortable fixed="left" />
+          <el-table-column prop="creatortime" label="创建时间" width="300" sortablealign="center"/>
+          <el-table-column prop="creatorusername" label="创建人名称" width="300" sortablealign="center"/>
+          <el-table-column prop="lastmodifytime" label="修改时间" width="300" sortablealign="center"/>
+          <el-table-column prop="lastmodifyusername" label="修改人名称" width="300"sortable align="center"/>
           <el-table-column label="操作" fixed="right" width="100">
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
@@ -52,12 +57,12 @@
           </el-table-column>
         </JNPF-table>
         <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-					@pagination="initData" />
+                    @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>
 
@@ -83,7 +88,7 @@
       return {
         detailVisible: false,
         query: {
-					mName: undefined,
+          mName: undefined
         },
         treeProps: {
           children: 'children',
@@ -97,8 +102,8 @@
         listQuery: {
           currentPage: 1,
           pageSize: 20,
-					sort: "desc",
-					sidx: "",
+          sort: 'desc',
+          sidx: ''
         },
         formVisible: false,
         exportBoxVisible: false,
@@ -121,8 +126,8 @@
           {
             prop: 'lastmodifyusername',
             label: '修改人名称'
-					},
-				],
+          }
+        ]
       }
     },
     computed: {
@@ -150,20 +155,25 @@
         this.initData()
       },
       initData() {
-				this.listLoading = true;
+        this.listLoading = true
         let _query = {
           ...this.listQuery,
           ...this.query,
           menuId: this.menuId
-				};
+        }
         request({
           url: `/api/areasetting/Areasetting/getList`,
           method: 'post',
           data: _query
         }).then(res => {
-					var _list = [];
+          var _list = []
           for (let i = 0; i < res.data.list.length; i++) {
-						let _data = res.data.list[i];
+            res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
+              10) : '';
+            res.data.list[i].lastmodifytime = res.data.list[i].lastmodifytime ? res.data.list[i].lastmodifytime.substring(0,
+              10) : '';
+
+            let _data = res.data.list[i]
             _list.push(_data)
           }
           this.list = _list
@@ -186,9 +196,10 @@
               onClose: () => {
                 this.initData()
               }
-						});
             })
-				}).catch(() => {});
+          })
+        }).catch(() => {
+        })
       },
       handleSelectionChange(val) {
         const res = val.map(item => item.id)
@@ -199,7 +210,7 @@
           this.$message({
             type: 'error',
             message: '请选择一条数据',
-						duration: 1500,
+            duration: 1500
           })
           return
         }
@@ -217,9 +228,10 @@
               onClose: () => {
                 this.initData()
               }
-						});
             })
-				}).catch(() => {})
+          })
+        }).catch(() => {
+        })
       },
       addOrUpdateHandle(id, isDetail) {
         this.formVisible = true
@@ -255,8 +267,8 @@
         this.listQuery = {
           currentPage: 1,
           pageSize: 20,
-					sort: "desc",
-					sidx: "",
+          sort: 'desc',
+          sidx: ''
         }
         this.initData()
       },

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

@@ -1,16 +1,16 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
+  <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="800px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
+             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-col :span="8">
             <el-form-item label="单据编号"
- prop="documentNo" >
+                          prop="documentNo">
               <el-input v-model="dataForm.documentNo"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
 
               </el-input>
             </el-form-item>
@@ -24,119 +24,121 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="客户名称"
- prop="customerName" >
+          <el-col :span="8">
+            <el-form-item label="客户"
+                          prop="customerName">
               <el-input v-model="dataForm.customerName"
                         placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="金额"
- prop="amount" >
-                    <el-input    v-model="dataForm.amount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+                          prop="amount">
+              <el-input v-model="dataForm.amount "
+                        placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="数量"
- prop="quantity" >
+          <el-col :span="8">
+            <el-form-item label="商品数量"
+                          prop="quantity">
               <el-input v-model="dataForm.quantity"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="发票数量"
- prop="invoiceQuantity" >
+                          prop="invoiceQuantity">
               <el-input v-model="dataForm.invoiceQuantity"
                         placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="客户税号"
- prop="customerTaxNo" >
+                          prop="customerTaxNo">
               <el-input v-model="dataForm.customerTaxNo"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="客户地址"
- prop="customerAddress" >
+                          prop="customerAddress">
               <el-input v-model="dataForm.customerAddress"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="币别 "
- prop="currency" >
+                          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>
+                         placeholder="请选择" clearable :style='{"width":"100%"}' :disabled="true">
+                <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-col :span="8">
             <el-form-item label="备注"
- prop="remark" >
+                          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-col :span="8">
             <el-form-item label="发票金额"
- prop="invoiceAmount" >
+                          prop="invoiceAmount">
               <el-input v-model="dataForm.invoiceAmount"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+                        placeholder="请输入" clearable :style='{"width":"100%"}' :disabled="true">
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="销售订单号"
- prop="salesOrderNo" >
+                          prop="salesOrderNo">
               <el-input v-model="dataForm.salesOrderNo"
                         placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="合同名称"
- prop="contractName" >
+                          prop="contractName">
               <el-input v-model="dataForm.contractName"
                         placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="单据状态 "
- prop="status" >
+                          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-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>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="制单人"
- prop="creatorUserName" >
+                          prop="creatorUserName">
               <el-input v-model="dataForm.creatorUserName"
                         placeholder="请输入" clearable :style='{"width":"100%"}'>
 
@@ -146,15 +148,15 @@
           <el-col :span="24">
             <el-tabs v-model="activewkrlwe" tab-position="top" class="mb-20">
               <el-tab-pane label="应收明细">
-            </el-tab-pane >
+              </el-tab-pane>
               <el-tab-pane label="发票明细">
-    <el-col :span="24"  >
+                <el-col :span="24">
                   <el-form-item label-width="0">
                     <div class="JNPF-common-title">
                       <h2></h2>
                     </div>
-    <el-table :data="dataForm.arinvoices_item0List" size='mini'   >
-        <el-table-column type="index" width="50" label="序号" align="center" />
+                    <el-table :data="dataForm.arinvoices_item0List" size='mini'>
+                      <el-table-column type="index" width="50" label="序号" align="center"/>
                       <el-table-column prop="invoiceCode" label="发票代码">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.invoiceCode"
@@ -173,7 +175,8 @@
                         <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-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>
@@ -207,9 +210,11 @@
                         </template>
                       </el-table-column>
 
-    <el-table-column label="操作" width="50" >
+                      <el-table-column label="操作" width="50">
                         <template slot-scope="scope">
-            <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delarinvoices_item0List(scope.$index)">删除</el-button>
+                          <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                                     @click="delarinvoices_item0List(scope.$index)">删除
+                          </el-button>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -218,11 +223,11 @@
                     </div>
                   </el-form-item>
                 </el-col>
-            </el-tab-pane >
+              </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>
@@ -234,6 +239,7 @@
   import request from '@/utils/request'
   import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
   import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+
   export default {
     components: {},
     props: [],
@@ -243,76 +249,85 @@
         loading: false,
         isDetail: false,
         dataForm: {
-                            documentNo : '',
-                            businessDate : '',
-                            customerName : '',
-                            amount : '',
-                            quantity : '',
-                            invoiceQuantity : '',
-                            customerTaxNo : '',
-                            customerAddress : '',
-                            currency : "0",
-                            remark : '',
-                            invoiceAmount : '',
-                            salesOrderNo : '',
-                            contractName : '',
-                            status : "0",
-                            creatorUserName : '',
-                        arinvoices_item0List:[],
+          documentNo: '',
+          businessDate: '',
+          customerName: '',
+          amount: '',
+          quantity: '',
+          invoiceQuantity: '',
+          customerTaxNo: '',
+          customerAddress: '',
+          currency: '0',
+          remark: '',
+          invoiceAmount: '',
+          salesOrderNo: '',
+          contractName: '',
+          status: '0',
+          creatorUserName: '',
+          arinvoices_item0List: []
         },
-                            activewkrlwe:'1',
+        activewkrlwe: '1',
         rules:
-            {
-            },
-                        currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
-                        statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],
+          {},
+        currencyOptions: [{ 'fullName': '人民币', 'id': '0' }, { 'fullName': '美元', 'id': '1' }, {
+          'fullName': '英镑',
+          'id': '2'
+        }],
+        statusOptions: [{ 'fullName': '已保存', 'id': '0' }, { 'fullName': '审批中', 'id': '1' }, {
+          'fullName': '已审批',
+          'id': '2'
+        }],
 
-                        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() {},
+    mounted() {
+    },
     methods: {
       arinvoices_item0Exist() {
-				let isOk = true;
-					for(let i=0;i<this.dataForm.arinvoices_item0List.length;i++){
-						const e = this.dataForm.arinvoices_item0List[i];
+        let isOk = true
+        for (let i = 0; i < this.dataForm.arinvoices_item0List.length; i++) {
+          const e = this.dataForm.arinvoices_item0List[i]
         }
-				return isOk;
+        return isOk
       },
-            clearData(data){
+      clearData(data) {
         for (let key in data) {
           if (data[key] instanceof Array) {
-                        data[key] = [];
+            data[key] = []
           } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
+            this.clearData(data[key])
           } else {
-                        data[key] = "";
+            data[key] = ''
           }
         }
       },
       init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
+        this.dataForm.id = id || 0
+        this.visible = true
+        this.isDetail = isDetail || false
         this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
+          this.$refs['elForm'].resetFields()
+          if (this.dataForm.id) {
             this.loading = true
             request({
-                            url: '/api/arinvoices/Arinvoices/'+this.dataForm.id,
+              url: '/api/arinvoices/Arinvoices/' + this.dataForm.id,
               method: 'get'
             }).then(res => {
               this.dataInfo(res.data)
               this.loading = false
-                        });
-                    }else{
+            })
+          } else {
             this.clearData(this.dataForm)
           }
-                });
+        })
         this.$store.commit('generator/UPDATE_RELATION_DATA', {})
       },
       // 表单提交
@@ -325,7 +340,7 @@
         })
       },
       request() {
-                var _data =this.dataList()
+        var _data = this.dataList()
         if (!this.dataForm.id) {
           request({
             url: '/api/arinvoices/Arinvoices',
@@ -342,9 +357,9 @@
               }
             })
           })
-                }else{
+        } else {
           request({
-                        url: '/api/arinvoices/Arinvoices/'+this.dataForm.id,
+            url: '/api/arinvoices/Arinvoices/' + this.dataForm.id,
             method: 'PUT',
             data: _data
           }).then((res) => {
@@ -360,35 +375,35 @@
           })
         }
       },
-                addarinvoices_item0List(){
+      addarinvoices_item0List() {
         let item = {
-                            invoiceCode:undefined,
-                            invoiceNo:undefined,
-                            taxRate:undefined,
-                            taxAmount:undefined,
-                            amountNotTax:undefined,
-                            creatorUserName:undefined,
+          invoiceCode: undefined,
+          invoiceNo: undefined,
+          taxRate: undefined,
+          taxAmount: undefined,
+          amountNotTax: undefined,
+          creatorUserName: undefined
         }
         this.dataForm.arinvoices_item0List.push(item)
       },
       delarinvoices_item0List(index) {
-                    this.dataForm.arinvoices_item0List.splice(index, 1);
+        this.dataForm.arinvoices_item0List.splice(index, 1)
       },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                    for(let i=0;i<_data.arinvoices_item0List.length;i++){
-                        var _list = _data.arinvoices_item0List[i];
+      dataList() {
+        var _data = JSON.parse(JSON.stringify(this.dataForm))
+        for (let i = 0; i < _data.arinvoices_item0List.length; i++) {
+          var _list = _data.arinvoices_item0List[i]
         }
-                return _data;
+        return _data
       },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                    for(let i=0;i<_dataAll.arinvoices_item0List.length;i++){
-                        var _list = _dataAll.arinvoices_item0List[i];
+      dataInfo(dataAll) {
+        let _dataAll = dataAll
+        for (let i = 0; i < _dataAll.arinvoices_item0List.length; i++) {
+          var _list = _dataAll.arinvoices_item0List[i]
         }
         this.dataForm = _dataAll
-            },
-        },
+      }
+    }
   }
 
 </script>

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

@@ -6,7 +6,7 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="单据编号">
-                                        <el-input v-model="query.documentNo" placeholder="请输入" clearable>  </el-input>
+              <el-input v-model="query.documentNo" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -22,9 +22,9 @@
           <div>
             <el-button type="primary" 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-plus" @click="1">编辑
             </el-button>
@@ -46,53 +46,67 @@
             <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" />
+        <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="客户名称" sortable width="150" align="center" fixed="left"
-/>
+          />
           <el-table-column prop="amount" label="金额" width="120" sortable align="center"
-/>
+          />
           <el-table-column prop="quantity" label="数量" width="120" sortable align="center"
-/>
+          />
           <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="发票金额" sortable width="120" align="center"
-/>
+          />
           <el-table-column prop="invoiceQuantity" label="发票数量" sortable width="120" align="center"
-/>
+          />
           <el-table-column prop="salesOrderNo" label="销售订单号" sortable width="200" align="center"
-/>
+          />
           <el-table-column prop="contractName" label="合同名称" sortable width="200" align="center"
-/>
+          />
           <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="120" sortable align="center"
-/>
+          />
           <el-table-column label="操作" fixed="right"
-width="150" >
+                           width="150">
             <template slot-scope="scope">
               <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
+                         @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>
+              <el-button type="text"
+                         @click="goDetail">撤回申请
+              </el-button>
+              <el-button type="text"
+                         @click="goDetail">审核
+              </el-button>
+              <el-button type="text"
+                         @click="goDetail">弃审
+              </el-button>
+              <el-button type="text"
+                         @click="goDetail">提交
+              </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"/>
@@ -103,19 +117,19 @@ width="150" >
 
 <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',
@@ -128,28 +142,34 @@ width="150" >
         listQuery: {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
+          sort: 'desc',
+          sidx: ''
         },
         formVisible: false,
         exportBoxVisible: false,
         columnList: [
-                    {prop: 'documentNo', label: '单据编号'},
-                    {prop: 'customerName', label: '客户名称'},
-                    {prop: 'amount', label: '金额'},
-                    {prop: 'quantity', label: '数量'},
-                    {prop: 'currency', label: '币别 '},
-                    {prop: 'invoiceAmount', label: '发票金额'},
-                    {prop: 'invoiceQuantity', label: '发票数量'},
-                    {prop: 'salesOrderNo', label: '销售订单号'},
-                    {prop: 'contractName', label: '合同名称'},
-                    {prop: 'status', label: '单据状态 '},
-                    {prop: 'creatorUserName', label: '制单人'},
+          { prop: 'documentNo', label: '单据编号' },
+          { prop: 'customerName', label: '客户名称' },
+          { prop: 'amount', label: '金额' },
+          { prop: 'quantity', label: '数量' },
+          { prop: 'currency', label: '币别 ' },
+          { prop: 'invoiceAmount', label: '发票金额' },
+          { prop: 'invoiceQuantity', label: '发票数量' },
+          { prop: 'salesOrderNo', label: '销售订单号' },
+          { prop: 'contractName', label: '合同名称' },
+          { prop: 'status', label: '单据状态 ' },
+          { prop: 'creatorUserName', label: '制单人' }
         ],
-                                currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
-                            currencyProps:{"label":"fullName","value":"id"},
-                                statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],
-                            statusProps:{"label":"fullName","value":"id"},
+        currencyOptions: [{ 'fullName': '人民币', 'id': '0' }, { 'fullName': '美元', 'id': '1' }, {
+          'fullName': '英镑',
+          'id': '2'
+        }],
+        currencyProps: { 'label': 'fullName', 'value': 'id' },
+        statusOptions: [{ 'fullName': '已保存', 'id': '0' }, { 'fullName': '审批中', 'id': '1' }, {
+          'fullName': '已审批',
+          'id': '2'
+        }],
+        statusProps: { 'label': 'fullName', 'value': 'id' }
       }
     },
     computed: {
@@ -161,32 +181,32 @@ 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()
       },
       initData() {
-                this.listLoading = true;
+        this.listLoading = true
         let _query = {
           ...this.listQuery,
           ...this.query,
-                    menuId:this.menuId
-                };
+          menuId: this.menuId
+        }
         request({
           url: `/api/arinvoices/Arinvoices/getList`,
           method: 'post',
           data: _query
         }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
+          var _list = []
+          for (let i = 0; i < res.data.list.length; i++) {
+            let _data = res.data.list[i]
             _list.push(_data)
           }
           this.list = _list
@@ -209,10 +229,10 @@ width="150" >
               onClose: () => {
                 this.initData()
               }
-                        });
+            })
           })
         }).catch(() => {
-                });
+        })
       },
       handleSelectionChange(val) {
         const res = val.map(item => item.id)
@@ -223,7 +243,7 @@ width="150" >
           this.$message({
             type: 'error',
             message: '请选择一条数据',
-                            duration: 1500,
+            duration: 1500
           })
           return
         }
@@ -241,7 +261,7 @@ width="150" >
               onClose: () => {
                 this.initData()
               }
-                            });
+            })
           })
         }).catch(() => {
         })
@@ -259,7 +279,7 @@ 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/arinvoices/Arinvoices/Actions/Export`,
           method: 'GET',
@@ -275,8 +295,8 @@ width="150" >
         this.listQuery = {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
+          sort: 'desc',
+          sidx: ''
         }
         this.initData()
       },

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

@@ -1,6 +1,6 @@
 <template>
-<transition name="el-zoom-in-center">
-<div class="JNPF-preview-main">
+  <transition name="el-zoom-in-center">
+    <div class="JNPF-preview-main">
       <div class="JNPF-common-page-header">
         <el-page-header @back="goBack"
                         content="详情"/>
@@ -8,175 +8,175 @@
           <el-button @click="goBack">取 消</el-button>
         </div>
       </div>
-<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
-<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" >
+      <el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
+        <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right">
           <template v-if="!loading">
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="合同类型 "
- prop="contractType" >
+                            prop="contractType">
                 <p>{{ dataForm.contractType | dynamicText(contractTypeOptions) }} </p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="合同编码"
- prop="contractCode" >
+                            prop="contractCode">
                 <p>{{dataForm.contractCode}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="合同名称"
- prop="contractName" >
+                            prop="contractName">
                 <p>{{dataForm.contractName}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="合同状态"
- prop="status" >
+                            prop="status">
                 <p>{{dataForm.status}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="开标日期"
- prop="bidOpeningDate" >
+                            prop="bidOpeningDate">
                 <p>{{jnpf.dateFormat(dataForm.bidOpeningDate)}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="开始日期"
- prop="startDate" >
+                            prop="startDate">
                 <p>{{jnpf.dateFormat(dataForm.startDate)}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="审核日期"
- prop="auditDate" >
+                            prop="auditDate">
                 <p>{{jnpf.dateFormat(dataForm.auditDate)}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="供货完成日期"
- prop="completionDate" >
+                            prop="completionDate">
                 <p>{{jnpf.dateFormat(dataForm.completionDate)}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="关闭日期"
- prop="closingDate" >
+                            prop="closingDate">
                 <p>{{jnpf.dateFormat(dataForm.closingDate)}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="回款周期(日)"
- prop="collectionCycle" >
+                            prop="collectionCycle">
                 <p>{{dataForm.collectionCycle}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="签订日期"
- prop="signingDate" >
+                            prop="signingDate">
                 <p>{{jnpf.dateFormat(dataForm.signingDate)}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="截止日期"
- prop="endDate" >
+                            prop="endDate">
                 <p>{{jnpf.dateFormat(dataForm.endDate)}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="供应商/客户编"
- prop="code" >
+                            prop="code">
                 <p>{{dataForm.code}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="供应商/客户名"
- prop="name" >
+                            prop="name">
                 <p>{{dataForm.name}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="对方合同号"
- prop="contractNo" >
+                            prop="contractNo">
                 <p>{{dataForm.contractNo}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
-                <el-form-item  label="币种 "  
- prop="currency" >
+            <el-col :span="8">
+              <el-form-item label="币种： "
+                            prop="currency">
                 <p>{{dataForm.currency}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="数量"
- prop="num" >
+                            prop="num">
                 <p>{{dataForm.num}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="金额"
- prop="amount" >
+                            prop="amount">
                 <p>{{dataForm.amount}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8">
               <el-form-item label="库存组织"
- prop="organization" >
+                            prop="organization">
                 <p>{{dataForm.organization}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="16" >
+            <el-col :span="16">
               <el-form-item label="备注"
- prop="remark" >
+                            prop="remark">
                 <p>{{dataForm.remark}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24">
               <el-form-item label="合同分类 "
- prop="classification" >
+                            prop="classification">
                 <p>{{dataForm.classification}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24">
               <el-form-item label="申报日期"
- prop="declarationDate" >
+                            prop="declarationDate">
                 <p>{{dataForm.declarationDate}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24">
               <el-form-item label="部门编码"
- prop="deptCode" >
+                            prop="deptCode">
                 <p>{{dataForm.deptCode}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24">
               <el-form-item label="录入人"
- prop="creatorusername" >
+                            prop="creatorusername">
                 <p>{{dataForm.creatorusername}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24">
               <el-form-item label="部门名称"
- prop="deptName" >
+                            prop="deptName">
                 <p>{{dataForm.deptName}}</p>
               </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24">
               <el-form-item label="集团审批"
- prop="approval" >
+                            prop="approval">
                 <p>{{dataForm.approval}}</p>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-tabs v-model="activemdfrsi" tab-position="top" class="mb-20">
                 <el-tab-pane label="物料明细">
-    <el-col :span="24"  >
+                  <el-col :span="24">
                     <el-form-item label-width="0">
                       <div class="JNPF-common-title">
                         <h2></h2>
                       </div>
-    <el-table :data="dataForm.contract_item0List" size='mini'   >
-        <el-table-column type="index" width="50" label="序号" align="center" />
+                      <el-table :data="dataForm.contract_item0List" size='mini'>
+                        <el-table-column type="index" width="50" label="序号" align="center"/>
                         <el-table-column prop="materialCode" label="物料编码">
                           <template slot-scope="scope">
                             <p>{{scope.row.materialCode}}</p>
@@ -235,41 +235,42 @@
                       </el-table>
                     </el-form-item>
                   </el-col>
-            </el-tab-pane >
+                </el-tab-pane>
                 <el-tab-pane label="附件详情">
-    <el-col :span="24"  >
+                  <el-col :span="24">
                     <el-form-item label-width="0">
                       <div class="JNPF-common-title">
                         <h2></h2>
                       </div>
-    <el-table :data="dataForm.contract_item1List" size='mini'   >
-        <el-table-column type="index" width="50" label="序号" align="center" />
+                      <el-table :data="dataForm.contract_item1List" size='mini'>
+                        <el-table-column type="index" width="50" label="序号" align="center"/>
                         <el-table-column prop="enclosure" label="附件内容">
                           <template slot-scope="scope">
                             <JNPF-UploadFz v-model="scope.row.enclosure"
                                            disabled
- detailed  :fileSize="5"  sizeUnit="MB"  :limit="9"  buttonText="点击上传" >
+                                           detailed :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传">
                             </JNPF-UploadFz>
                           </template>
                         </el-table-column>
                       </el-table>
                     </el-form-item>
                   </el-col>
-            </el-tab-pane >
+                </el-tab-pane>
               </el-tabs>
             </el-col>
           </template>
-</el-form>
+        </el-form>
       </el-row>
     </div>
-</transition>
+  </transition>
 </template>
 <script>
   import request from '@/utils/request'
   import PrintBrowse from '@/components/PrintBrowse'
   import jnpf from '@/utils/jnpf'
+
   export default {
-        components: {PrintBrowse},
+    components: { PrintBrowse },
     props: [],
     data() {
       return {
@@ -278,38 +279,38 @@
         printBrowseVisible: false,
         printId: '',
         dataForm: {
-                id :'',
-                            contractType : "",
-                            contractCode : '',
-                            contractName : '',
-                            status : '',
-                            bidOpeningDate : '',
-                            startDate : '',
-                            auditDate : '',
-                            completionDate : '',
-                            closingDate : '',
-                            collectionCycle : '',
-                            signingDate : '',
-                            endDate : '',
-                            code : '',
-                            name : '',
-                            contractNo : '',
-                            currency : '',
-                            num : '',
-                            amount : '',
-                            organization : '',
-                            remark : '',
-                            classification : '',
-                            declarationDate : '',
-                            deptCode : '',
-                            creatorusername : '',
-                            deptName : '',
-                            approval : 0,
-                        contract_item0List:[],
-                        contract_item1List:[],
+          id: '',
+          contractType: '',
+          contractCode: '',
+          contractName: '',
+          status: '',
+          bidOpeningDate: '',
+          startDate: '',
+          auditDate: '',
+          completionDate: '',
+          closingDate: '',
+          collectionCycle: '',
+          signingDate: '',
+          endDate: '',
+          code: '',
+          name: '',
+          contractNo: '',
+          currency: '',
+          num: '',
+          amount: '',
+          organization: '',
+          remark: '',
+          classification: '',
+          declarationDate: '',
+          deptCode: '',
+          creatorusername: '',
+          deptName: '',
+          approval: 0,
+          contract_item0List: [],
+          contract_item1List: []
         },
-                            activemdfrsi:'0',
-                                contractTypeOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
+        activemdfrsi: '0',
+        contractTypeOptions: [{ 'fullName': '选项一', 'id': '1' }, { 'fullName': '选项二', 'id': '2' }]
 
       }
     },
@@ -318,16 +319,17 @@
     created() {
 
     },
-        mounted() {},
+    mounted() {
+    },
     methods: {
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                for(let i=0;i<_dataAll.contract_item0List.length;i++){
-                    var _list = _dataAll.contract_item0List[i];
+      dataInfo(dataAll) {
+        let _dataAll = dataAll
+        for (let i = 0; i < _dataAll.contract_item0List.length; i++) {
+          var _list = _dataAll.contract_item0List[i]
         }
-                for(let i=0;i<_dataAll.contract_item1List.length;i++){
-                    var _list = _dataAll.contract_item1List[i];
-                            _list.enclosure = _list.enclosure? JSON.parse(_list.enclosure):[]
+        for (let i = 0; i < _dataAll.contract_item1List.length; i++) {
+          var _list = _dataAll.contract_item1List[i]
+          _list.enclosure = _list.enclosure ? JSON.parse(_list.enclosure) : []
         }
         this.dataForm = _dataAll
       },
@@ -336,13 +338,13 @@
         this.$emit('refresh')
       },
       init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
+        this.dataForm.id = id || 0
+        this.visible = true
         this.$nextTick(() => {
-                    if(this.dataForm.id){
+          if (this.dataForm.id) {
             this.loading = true
             request({
-                            url: '/api/example/ContractFile/detail/'+this.dataForm.id,
+              url: '/api/example/ContractFile/detail/' + this.dataForm.id,
               method: 'get'
             }).then(res => {
               this.dataInfo(res.data)
@@ -351,8 +353,8 @@
           }
 
         })
-            },
-        },
+      }
+    }
   }
 
 </script>

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

@@ -6,12 +6,12 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="合同编码">
-							<el-input v-model="query.contractCode" placeholder="请输入" clearable> </el-input>
+              <el-input v-model="query.contractCode" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="合同名称">
-							<el-input v-model="query.contractName" placeholder="请输入" clearable> </el-input>
+              <el-input v-model="query.contractName" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -25,45 +25,50 @@
       <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>-->
-<!--            <el-button type="text" icon="=el-icon-detail" @click="goDetail(scope.row.id)">查看-->
-<!--            </el-button>-->
+            <!--						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增-->
+            <!--						</el-button>-->
+            <!--            <el-button type="text" icon="=el-icon-detail" @click="goDetail(scope.row.id)">查看-->
+            <!--            </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-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()" />
+                       @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="contractCode" label="合同编码" width="0" align="left" />
-					<el-table-column prop="contractName" label="合同名称" width="0" align="left" />
-					<el-table-column prop="contractNo" label="对方合同号" width="0" align="left" />
-					<el-table-column label="合同类型 " width="0" prop="contractType" 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="contractCode" label="合同编码" width="200" align="center" sortable fixed="left"/>
+          <el-table-column prop="contractName" label="合同名称" width="200" align="center" sortable fixed="left"/>
+          <el-table-column prop="contractNo" label="对方合同号" width="200" align="center" sortable/>
+          <el-table-column label="合同类型 " width="120" prop="contractType" algin="center" sortable>
             <template slot-scope="scope">
               {{ scope.row.contractType | dynamicText(contractTypeOptions) }}
             </template>
           </el-table-column>
-					<el-table-column prop="classification" label="合同分类 " width="0" align="left" />
-					<el-table-column prop="declarationDate" label="申报日期" width="0" align="left" />
-					<el-table-column prop="name" label="供应商/客户名" width="0" align="left" />
-					<el-table-column prop="num" label="数量" width="0" align="left" />
-					<el-table-column prop="amount" label="金额" width="0" align="left" />
-					<el-table-column prop="deptName" label="部门名称" width="0" align="left" />
-					<el-table-column prop="remark" label="备注" width="0" align="left" />
-					<el-table-column prop="creatorusername" label="录入人" width="0" align="left" />
-					<el-table-column prop="status" label="合同状态" width="0" align="left" />
+          <el-table-column prop="classification" label="合同分类 " width="120" align="center" sortable/>
+          <el-table-column prop="declarationDate" label="申报日期" width="120" align="center" sortable/>
+          <el-table-column prop="name" label="供应商/客户名" width="200" align="center" sortable/>
+          <el-table-column prop="num" label="数量" width="120" align="center" sortable/>
+          <el-table-column prop="amount" label="金额" width="120" align="center" sortable/>
+          <el-table-column prop="deptName" label="部门名称" width="120" align="center" sortable/>
+          <el-table-column prop="remark" label="备注" width="120" align="center" sortable/>
+          <el-table-column prop="creatorusername" label="录入人" width="120" align="center" sortable/>
 
+          <el-table-column prop="status" label="合同状态" width="120" align="center" sortable>
+          <template slot-scope="scope">
+            {{ scope.row.status | dynamicText(statusOptions) }}
+          </template>
+          </el-table-column>
 
-					<el-table-column prop="approval" label="集团审批" width="0" align="left" >
+          <el-table-column prop="approval" label="集团审批" width="120" align="center" sortable>
             <template slot-scope="scope">
               <el-tag type="danger" disable-transitions v-if="scope.row.approval == '关'">禁用
               </el-tag>
@@ -76,22 +81,22 @@
             <template slot-scope="scope">
               <el-button type="text" @click="exportData()">导出
               </el-button>
-<!--							<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="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" />
+                    @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>
 
@@ -118,7 +123,7 @@
         detailVisible: false,
         query: {
           contractCode: undefined,
-					contractName: undefined,
+          contractName: undefined
         },
         treeProps: {
           children: 'children',
@@ -132,8 +137,8 @@
         listQuery: {
           currentPage: 1,
           pageSize: 20,
-					sort: "desc",
-					sidx: "",
+          sort: 'desc',
+          sidx: ''
         },
         formVisible: false,
         exportBoxVisible: false,
@@ -192,34 +197,40 @@
           {
             prop: 'approval',
             label: '集团审批'
-					},
+          }
         ],
         contractTypeOptions: [{
-						"fullName": "采购合同",
-						"id": "1"
+          'fullName': '采购合同',
+          'id': '1'
         }, {
-						"fullName": "销售合同",
-						"id": "2"
+          'fullName': '销售合同',
+          'id': '2'
         },
           {
-						"fullName": "租赁合同",
-						"id": "3"
+            'fullName': '租赁合同',
+            'id': '3'
           }, {
-						"fullName": "仓储合同",
-						"id": "4"
+            'fullName': '仓储合同',
+            'id': '4'
           }, {
-						"fullName": "运输合同",
-						"id": "5"
+            'fullName': '运输合同',
+            'id': '5'
           },
           {
-						"fullName": "施工合同",
-						"id": "6"
+            'fullName': '施工合同',
+            'id': '6'
           }
         ],
+
+        statusOptions: [{
+          "fullName": "进行中",
+          "id": "1"
+        }],
+
         contractTypeProps: {
-					"label": "fullName",
-					"value": "id"
-				},
+          'label': 'fullName',
+          'value': 'id'
+        }
       }
     },
     computed: {
@@ -247,20 +258,21 @@
         this.initData()
       },
       initData() {
-				this.listLoading = true;
+        this.listLoading = true
         let _query = {
           ...this.listQuery,
           ...this.query,
           menuId: this.menuId
-				};
+        }
         request({
           url: `/api/example/ContractFile/getList`,
           method: 'post',
           data: _query
         }).then(res => {
-					var _list = [];
+          var _list = []
           for (let i = 0; i < res.data.list.length; i++) {
-						let _data = res.data.list[i];
+            res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0, 10) : '';
+            let _data = res.data.list[i]
             _list.push(_data)
           }
           this.list = _list
@@ -283,9 +295,10 @@
               onClose: () => {
                 this.initData()
               }
-						});
             })
-				}).catch(() => {});
+          })
+        }).catch(() => {
+        })
       },
       handleSelectionChange(val) {
         const res = val.map(item => item.id)
@@ -296,7 +309,7 @@
           this.$message({
             type: 'error',
             message: '请选择一条数据',
-						duration: 1500,
+            duration: 1500
           })
           return
         }
@@ -314,9 +327,10 @@
               onClose: () => {
                 this.initData()
               }
-						});
             })
-				}).catch(() => {})
+          })
+        }).catch(() => {
+        })
       },
       addOrUpdateHandle(id, isDetail) {
         this.formVisible = true
@@ -352,8 +366,8 @@
         this.listQuery = {
           currentPage: 1,
           pageSize: 20,
-					sort: "desc",
-					sidx: "contractCode",
+          sort: 'desc',
+          sidx: 'contractCode'
         }
         this.initData()
       },

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

@@ -2,7 +2,7 @@
 <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="600px">
+           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">

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

@@ -6,23 +6,23 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="客户编码">
-                                        <el-input v-model="query.supplierCd" placeholder="请输入" clearable>  </el-input>
+              <el-input v-model="query.supplierCd" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="客户名称">
-                                        <el-input v-model="query.supplierNm" placeholder="请输入" clearable>  </el-input>
+              <el-input v-model="query.supplierNm" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="纳税编号">
-                                        <el-input v-model="query.vatRegistrationNum" placeholder="请输入" clearable>  </el-input>
+              <el-input v-model="query.vatRegistrationNum" 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.contactName" placeholder="请输入" clearable>  </el-input>
+                <el-input v-model="query.contactName" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
           </template>
@@ -45,9 +45,11 @@
           <div>
             <el-button type="primary" 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-download" @click="">导入
+            </el-button>
+            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -58,58 +60,60 @@
             <screenfull isContainer/>
           </div>
         </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="supplierCd" label="客户编码" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="supplierNm" label="客户名称" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="orgId" label="公司ID" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="vatRegistrationNum" label="纳税编号" width="0" align="left"
-/>
-                                <el-table-column label="客户等级" width="0" prop="customerLevel" algin="left"
- sortable="custom" >
+        <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="supplierCd" label="客户编码" width="200" align="center" sortable fixed="left"
+                           sortable="custom"/>
+          <el-table-column prop="supplierNm" label="客户名称" width="200" align="center" sortable fixed="left"
+                           sortable="custom"/>
+          <el-table-column prop="orgId" label="公司ID" width="200" align="center" sortable
+                           sortable="custom"/>
+          <el-table-column prop="vatRegistrationNum" label="纳税编号" width="200" align="center" sortable
+          />
+          <el-table-column label="客户等级" width="120" prop="customerLevel" algin="center" sortable
+                           sortable="custom">
             <template slot-scope="scope">
               {{ scope.row.customerLevel | dynamicText(customerLevelOptions) }}
             </template>
           </el-table-column>
-                            <el-table-column prop="contactName" label="联系人" width="0" align="left"
- sortable="custom" />
-                            <el-table-column prop="country" label="国家" width="0" align="left"
-/>
-                            <el-table-column prop="contactPhone" label="电话" width="0" align="left"
- sortable="custom" />
-<!--                            <el-table-column prop="province" label="省市县" width="0" align="left"-->
-<!--/>-->
-                            <el-table-column prop="bank" label="开户行" width="0" align="left"
-/>
-                                <el-table-column label="是否启用" width="0" prop="status" algin="left"
- sortable="custom" >
+          <el-table-column prop="contactName" label="联系人" width="120" align="center" sortable
+                           sortable="custom"/>
+          <el-table-column prop="country" label="国家" width="120" align="center" sortable
+          />
+          <el-table-column prop="contactPhone" label="电话" width="150" align="center" sortable
+                           sortable="custom"/>
+          <!--                            <el-table-column prop="province" label="省市县" width="0" align="left"-->
+          <!--/>-->
+          <el-table-column prop="bank" label="开户行" width="200" align="left" sortable
+          />
+          <el-table-column label="是否启用" width="120" prop="status" algin="left" sortable
+                           sortable="custom">
             <template slot-scope="scope">
               {{ scope.row.status | dynamicText(statusOptions) }}
             </template>
           </el-table-column>
           <el-table-column prop="bankAccount" label="银行账号" width="0" align="left"
-/>
+          />
           <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" />
+                           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 label="操作" fixed="right"
-width="150" >
+                           width="150">
             <template slot-scope="scope">
               <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
+                         @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
               <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
@@ -119,7 +123,8 @@ width="150" >
             </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"/>
@@ -130,23 +135,23 @@ width="150" >
 
 <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 {
         showAll: false,
         detailVisible: false,
         query: {
-                                supplierCd:undefined,
-                                supplierNm:undefined,
-                                vatRegistrationNum:undefined,
-                                contactName:undefined,
+          supplierCd: undefined,
+          supplierNm: undefined,
+          vatRegistrationNum: undefined,
+          contactName: undefined
         },
         treeProps: {
           children: 'children',
@@ -159,36 +164,39 @@ width="150" >
         listQuery: {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
+          sort: 'desc',
+          sidx: 'creatorTime'
         },
         formVisible: false,
         exportBoxVisible: false,
         columnList: [
-                    {prop: 'supplierCd', label: '客户编码'},
-                    {prop: 'supplierNm', label: '客户名称'},
-                    {prop: 'orgId', label: '公司ID'},
-                    {prop: 'vatRegistrationNum', label: '纳税编号'},
-                    {prop: 'customerLevel', label: '客户等级'},
-                    {prop: 'contactName', label: '联系人'},
-                    {prop: 'country', label: '国家'},
-                    {prop: 'contactPhone', label: '电话'},
-                    {prop: 'province', label: '省市县'},
-                    {prop: 'bank', label: '开户行'},
-                    {prop: 'status', label: '是否启用'},
-                    {prop: 'bankAccount', label: '银行账号'},
-                    {prop: 'enterprise', label: '企业性质'},
-                    {prop: 'address', label: '地址'},
-                    {prop: 'classification', label: '客户分类'},
+          { prop: 'supplierCd', label: '客户编码' },
+          { prop: 'supplierNm', label: '客户名称' },
+          { prop: 'orgId', label: '公司ID' },
+          { prop: 'vatRegistrationNum', label: '纳税编号' },
+          { prop: 'customerLevel', label: '客户等级' },
+          { prop: 'contactName', label: '联系人' },
+          { prop: 'country', label: '国家' },
+          { prop: 'contactPhone', label: '电话' },
+          { prop: 'province', label: '省市县' },
+          { prop: 'bank', label: '开户行' },
+          { prop: 'status', label: '是否启用' },
+          { prop: 'bankAccount', label: '银行账号' },
+          { prop: 'enterprise', label: '企业性质' },
+          { prop: 'address', label: '地址' },
+          { prop: 'classification', label: '客户分类' }
         ],
-                                customerLevelOptions:[{"fullName":"一级","id":"1"},{"fullName":"二级","id":"2"},{"fullName":"三级","id":"3"}],
-                            customerLevelProps:{"label":"fullName","value":"id"},
-                                statusOptions:[{"fullName":"启用","id":"1"},{"fullName":"禁用","id":"2"}],
-                            statusProps:{"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"},
+        customerLevelOptions: [{ 'fullName': '一级', 'id': '1' }, { 'fullName': '二级', 'id': '2' }, {
+          'fullName': '三级',
+          'id': '3'
+        }],
+        customerLevelProps: { 'label': 'fullName', 'value': 'id' },
+        statusOptions: [{ 'fullName': '启用', 'id': '1' }, { 'fullName': '禁用', 'id': '2' }],
+        statusProps: { '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' }
       }
     },
     computed: {
@@ -200,32 +208,32 @@ 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()
       },
       initData() {
-                this.listLoading = true;
+        this.listLoading = true
         let _query = {
           ...this.listQuery,
           ...this.query,
-                    menuId:this.menuId
-                };
+          menuId: this.menuId
+        }
         request({
           url: `/api/example/Customer/getList`,
           method: 'post',
           data: _query
         }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
+          var _list = []
+          for (let i = 0; i < res.data.list.length; i++) {
+            let _data = res.data.list[i]
             _list.push(_data)
           }
           this.list = _list
@@ -248,10 +256,10 @@ width="150" >
               onClose: () => {
                 this.initData()
               }
-                        });
+            })
           })
         }).catch(() => {
-                });
+        })
       },
       handleSelectionChange(val) {
         const res = val.map(item => item.id)
@@ -262,7 +270,7 @@ width="150" >
           this.$message({
             type: 'error',
             message: '请选择一条数据',
-                            duration: 1500,
+            duration: 1500
           })
           return
         }
@@ -280,7 +288,7 @@ width="150" >
               onClose: () => {
                 this.initData()
               }
-                            });
+            })
           })
         }).catch(() => {
         })
@@ -298,7 +306,7 @@ 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/example/Customer/Actions/Export`,
           method: 'GET',
@@ -314,8 +322,8 @@ width="150" >
         this.listQuery = {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
+          sort: 'desc',
+          sidx: 'creatorTime'
         }
         this.initData()
       },

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

@@ -1,140 +1,150 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
+  <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="800px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
+             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-col :span="8">
             <el-form-item label="单据编号"
- prop="documentNo" >
+                          prop="documentNo">
               <el-input v-model="dataForm.documentNo"
- placeholder="请输入单据编号"  clearable  :style='{"width":"100%"}'>
+                        placeholder="请输入单据编号" clearable :style='{"width":"100%"}' :disabled="true">
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="业务日期"
- prop="businessDate" >
+                          prop="businessDate">
               <el-date-picker v-model="dataForm.businessDate"
- placeholder="请选择业务日期"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+                              placeholder="请选择业务日期" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
+                              value-format="timestamp">
 
               </el-date-picker>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="金额"
- prop="amount" >
+                          prop="amount">
               <el-input v-model="dataForm.amount"
- placeholder="请输入单据编号"  clearable  :style='{"width":"100%"}'>
+                        placeholder="请输入单据编号" clearable :style='{"width":"100%"}':disabled="true">
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="数量"
- prop="quantity" >
+                          prop="quantity">
               <el-input v-model="dataForm.quantity"
- placeholder="请输入单据编号"  clearable  :style='{"width":"100%"}'>
+                        placeholder="请输入单据编号" clearable :style='{"width":"100%"}':disabled="true">
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="发票类型"
- prop="invoiceType" >
+                          prop="invoiceType">
               <el-select v-model="dataForm.invoiceType"
                          placeholder="请选择" :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in invoiceTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+                <el-option v-for="(item, index) in invoiceTypeOptions" :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-col :span="8">
             <el-form-item label="币别 "
- prop="currency" >
+                          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>
+                         placeholder="请选择" clearable :style='{"width":"100%"}' :disabled="true">
+                <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-col :span="8">
             <el-form-item label="备注"
- prop="remark" >
+                          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-col :span="8">
             <el-form-item label="发票金额"
- prop="invoiceAmount" >
+                          prop="invoiceAmount">
               <el-input v-model="dataForm.invoiceAmount"
- placeholder="请输入单据编号"  clearable  :style='{"width":"100%"}'>
+                        placeholder="请输入单据编号" clearable :style='{"width":"100%"}':disabled="true">
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="发票数量"
- prop="invoiceQuantity" >
+                          prop="invoiceQuantity">
               <el-input v-model="dataForm.invoiceQuantity"
- placeholder="请输入单据编号"  clearable  :style='{"width":"100%"}'>
+                        placeholder="请输入单据编号" clearable :style='{"width":"100%"}':disabled="true">
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="单据状态"
- prop="status" >
+                          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-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>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="制单人"
- prop="creatorUserName" >
+                          prop="creatorUserName">
               <el-input v-model="dataForm.creatorUserName"
- placeholder="请输入制单人"  clearable  :style='{"width":"100%"}'>
+                        placeholder="请输入制单人" clearable :style='{"width":"100%"}' :disabled="true">
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="采购订单号"
- prop="purchaseorderId" >
+                          prop="purchaseorderId">
               <popupSelect v-model="dataForm.purchaseorderId"
- placeholder="请选择"  clearable  field="purchaseorderId" interfaceId="389673535976550149" :columnOptions="purchaseorderIdcolumnOptions" propsValue="id" relationField="document_no" popupType="dialog"
+                           placeholder="请选择" clearable field="purchaseorderId" interfaceId="389673535976550149"
+                           :columnOptions="purchaseorderIdcolumnOptions" propsValue="id" relationField="document_no"
+                           popupType="dialog"
                            popupTitle="选择数据" popupWidth="800px"
               >
 
               </popupSelect>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="合同名称"
- prop="contractId" >
+                          prop="contractId">
               <popupSelect v-model="dataForm.contractId"
- placeholder="请选择"  clearable  field="contractId" interfaceId="389673903103979269" :columnOptions="contractIdcolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
+                           placeholder="请选择" clearable field="contractId" interfaceId="389673903103979269"
+                           :columnOptions="contractIdcolumnOptions" propsValue="id" relationField="contract_name"
+                           popupType="dialog"
                            popupTitle="选择数据" popupWidth="800px"
               >
 
               </popupSelect>
             </el-form-item>
           </el-col>
-            <el-col :span="8" >
+          <el-col :span="8">
             <el-form-item label="供应商"
- prop="supplierId" >
+                          prop="supplierId">
               <popupSelect v-model="dataForm.supplierId"
- placeholder="请选择"  clearable  field="supplierId" interfaceId="389674191453990661" :columnOptions="supplierIdcolumnOptions" propsValue="id" relationField="supplier_name" popupType="dialog"
+                           placeholder="请选择" clearable field="supplierId" interfaceId="389674191453990661"
+                           :columnOptions="supplierIdcolumnOptions" propsValue="id" relationField="supplier_name"
+                           popupType="dialog"
                            popupTitle="选择数据" popupWidth="800px"
               >
 
@@ -144,15 +154,15 @@
           <el-col :span="24">
             <el-tabs v-model="activebnrhzx" tab-position="top" class="mb-20">
               <el-tab-pane label="应付明细">
-            </el-tab-pane >
+              </el-tab-pane>
               <el-tab-pane label="发票明细">
-    <el-col :span="24"  >
+                <el-col :span="24">
                   <el-form-item label-width="0">
                     <div class="JNPF-common-title">
                       <h2></h2>
                     </div>
-    <el-table :data="dataForm.invoices_item0List" size='mini'   >
-        <el-table-column type="index" width="50" label="序号" align="center" />
+                    <el-table :data="dataForm.invoices_item0List" size='mini'>
+                      <el-table-column type="index" width="50" label="序号" align="center"/>
                       <el-table-column prop="invoiceCode" label="发票代码">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.invoiceCode"
@@ -171,7 +181,8 @@
                         <template slot-scope="scope">
                           <el-select v-model="scope.row.invoiceStatus"
                                      placeholder="请选择" clearable :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in invoiceStatusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+                            <el-option v-for="(item, index) in invoiceStatusOptions" :key="index" :label="item.fullName"
+                                       :value="item.id" :disabled="item.disabled"></el-option>
                           </el-select>
                         </template>
                       </el-table-column>
@@ -185,7 +196,8 @@
                       <el-table-column prop="invoicingDate" label="开票日期">
                         <template slot-scope="scope">
                           <el-date-picker v-model="scope.row.invoicingDate"
- placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
+                                          placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
+                                          format="yyyy-MM-dd" value-format="timestamp">
                           </el-date-picker>
                         </template>
                       </el-table-column>
@@ -198,9 +210,11 @@
                         </template>
                       </el-table-column>
 
-    <el-table-column label="操作" width="50" >
+                      <el-table-column label="操作" width="50">
                         <template slot-scope="scope">
-            <el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delinvoices_item0List(scope.$index)">删除</el-button>
+                          <el-button size="mini" type="text" class="JNPF-table-delBtn"
+                                     @click="delinvoices_item0List(scope.$index)">删除
+                          </el-button>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -209,11 +223,11 @@
                     </div>
                   </el-form-item>
                 </el-col>
-            </el-tab-pane >
+              </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>
@@ -225,88 +239,102 @@
   import request from '@/utils/request'
   import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
   import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+
   export default {
     components: {},
     props: [],
     data() {
       return {
+        excludeFields: [],
         visible: false,
         loading: false,
         isDetail: false,
         dataForm: {
-                            documentNo : '',
-                            businessDate : '',
-                            amount : '',
-                            quantity : '',
-                            invoiceType : "1",
-                            currency : "",
-                            remark : '',
-                            invoiceAmount : '',
-                            invoiceQuantity : '',
-                            status : "0",
-                            creatorUserName : '',
-                            purchaseorderId : "",
-                            contractId : "",
-                            supplierId : "",
-                        invoices_item0List:[],
+          documentNo: '',
+          businessDate: '',
+          amount: '',
+          quantity: '',
+          invoiceType: '1',
+          currency: '',
+          remark: '',
+          invoiceAmount: '',
+          invoiceQuantity: '',
+          status: '0',
+          creatorUserName: '',
+          purchaseorderId: '',
+          contractId: '',
+          supplierId: '',
+          invoices_item0List: []
         },
-                            activebnrhzx:'1',
+        activebnrhzx: '1',
         rules:
-            {
-            },
-                        invoiceTypeOptions:[{"fullName":"普通增值税发票","id":"1"},{"fullName":"专用增值税发票","id":"2"},{"fullName":"增值税电子普通发票","id":"3"},{"fullName":"增值税电子发票","id":"4"}],
-                        currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
-                        statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],
-                    purchaseorderIdcolumnOptions:[ {"label":"采购订单号","value":"document_no"},],
-                    contractIdcolumnOptions:[ {"label":"ID","value":"id"},{"label":"合同名称","value":"contract_name"},],
-                    supplierIdcolumnOptions:[ {"label":"ID","value":"id"},{"label":"供应商名称","value":"supplier_name"},],
+          {},
+        invoiceTypeOptions: [{ 'fullName': '普通增值税发票', 'id': '1' }, {
+          'fullName': '专用增值税发票',
+          'id': '2'
+        }, { 'fullName': '增值税电子普通发票', 'id': '3' }, { 'fullName': '增值税电子发票', 'id': '4' }],
+        currencyOptions: [{ 'fullName': '人民币', 'id': '0' }, { 'fullName': '美元', 'id': '1' }, {
+          'fullName': '英镑',
+          'id': '2'
+        }],
+        statusOptions: [{ 'fullName': '已保存', 'id': '0' }, { 'fullName': '审批中', 'id': '1' }, {
+          'fullName': '已审批',
+          'id': '2'
+        }],
+        purchaseorderIdcolumnOptions: [{ 'label': '采购订单号', 'value': 'document_no' }],
+        contractIdcolumnOptions: [{ 'label': 'ID', 'value': 'id' }, { 'label': '合同名称', 'value': 'contract_name' }],
+        supplierIdcolumnOptions: [{ 'label': 'ID', 'value': 'id' }, { 'label': '供应商名称', 'value': 'supplier_name' }],
 
-                        invoiceStatusOptions:[{"fullName":"正常","id":"0"},{"fullName":"红冲","id":"1"},{"fullName":"作废","id":"2"}],
+        invoiceStatusOptions: [{ 'fullName': '正常', 'id': '0' }, { 'fullName': '红冲', 'id': '1' }, {
+          'fullName': '作废',
+          'id': '2'
+        }]
       }
     },
     computed: {},
     watch: {},
     created() {
     },
-        mounted() {},
+    mounted() {
+    },
     methods: {
       invoices_item0Exist() {
-				let isOk = true;
-					for(let i=0;i<this.dataForm.invoices_item0List.length;i++){
-						const e = this.dataForm.invoices_item0List[i];
+        let isOk = true
+        for (let i = 0; i < this.dataForm.invoices_item0List.length; i++) {
+          const e = this.dataForm.invoices_item0List[i]
         }
-				return isOk;
+        return isOk
       },
-            clearData(data){
+      clearData(data) {
         for (let key in data) {
           if (data[key] instanceof Array) {
-                        data[key] = [];
+            data[key] = []
           } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
+            this.clearData(data[key])
           } else {
-                        data[key] = "";
+            data[key] = ''
           }
         }
       },
       init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
+        this.dataForm.id = id || 0
+        this.visible = true
+        this.isDetail = isDetail || false
         this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
+          this.$refs['elForm'].resetFields()
+          if (this.dataForm.id) {
             this.loading = true
             request({
-                            url: '/api/invoices/Invoices/'+this.dataForm.id,
+              url: '/api/invoices/Invoices/' + this.dataForm.id,
               method: 'get'
             }).then(res => {
               this.dataInfo(res.data)
               this.loading = false
-                        });
-                    }else{
+            })
+          } else {
             this.clearData(this.dataForm)
           }
-                });
+        })
         this.$store.commit('generator/UPDATE_RELATION_DATA', {})
       },
       // 表单提交
@@ -319,7 +347,7 @@
         })
       },
       request() {
-                var _data =this.dataList()
+        var _data = this.dataList()
         if (!this.dataForm.id) {
           request({
             url: '/api/invoices/Invoices',
@@ -336,9 +364,9 @@
               }
             })
           })
-                }else{
+        } else {
           request({
-                        url: '/api/invoices/Invoices/'+this.dataForm.id,
+            url: '/api/invoices/Invoices/' + this.dataForm.id,
             method: 'PUT',
             data: _data
           }).then((res) => {
@@ -354,34 +382,34 @@
           })
         }
       },
-                addinvoices_item0List(){
+      addinvoices_item0List() {
         let item = {
-                            invoiceCode:undefined,
-                            invoiceNo:undefined,
-                            invoiceStatus:undefined,
-                            creatorUserName:undefined,
-                            invoicingDate:undefined,
+          invoiceCode: undefined,
+          invoiceNo: undefined,
+          invoiceStatus: undefined,
+          creatorUserName: undefined,
+          invoicingDate: undefined
         }
         this.dataForm.invoices_item0List.push(item)
       },
       delinvoices_item0List(index) {
-                    this.dataForm.invoices_item0List.splice(index, 1);
+        this.dataForm.invoices_item0List.splice(index, 1)
       },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                    for(let i=0;i<_data.invoices_item0List.length;i++){
-                        var _list = _data.invoices_item0List[i];
+      dataList() {
+        var _data = JSON.parse(JSON.stringify(this.dataForm))
+        for (let i = 0; i < _data.invoices_item0List.length; i++) {
+          var _list = _data.invoices_item0List[i]
         }
-                return _data;
+        return _data
       },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                    for(let i=0;i<_dataAll.invoices_item0List.length;i++){
-                        var _list = _dataAll.invoices_item0List[i];
+      dataInfo(dataAll) {
+        let _dataAll = dataAll
+        for (let i = 0; i < _dataAll.invoices_item0List.length; i++) {
+          var _list = _dataAll.invoices_item0List[i]
         }
         this.dataForm = _dataAll
-            },
-        },
+      }
+    }
   }
 
 </script>

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

@@ -1,4 +1,4 @@
-  <template>
+<template>
   <div class="JNPF-common-layout">
 
     <div class="JNPF-common-layout-center">
@@ -6,7 +6,7 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="单据编号">
-                                        <el-input v-model="query.documentNo" placeholder="请输入" clearable>  </el-input>
+              <el-input v-model="query.documentNo" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -22,9 +22,18 @@
           <div>
             <el-button type="primary" 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="">编辑
             </el-button>
-                                    <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
+            <el-button type="text" icon="el-icon-download" @click="">查看
+            </el-button>
+            <el-button type="text" icon="el-icon-download" @click="">审核
+            </el-button>
+            <el-button type="text" icon="el-icon-download" @click="">弃审
+            </el-button>
+            <el-button type="text" icon="el-icon-download" @click="">提交
+            </el-button>
+
+            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -35,54 +44,70 @@
             <screenfull isContainer/>
           </div>
         </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="businessDate" label="业务日期" width="0" align="left"
-/>
-                            <el-table-column prop="documentNo" label="单据编号" width="0" align="left"
-/>
-                            <el-table-column prop="amount" label="金额" width="0" align="left"
-/>
-                            <el-table-column prop="quantity" 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="businessDate" label="业务日期" width="120" align="center"  fixed="left" sortable
+          />
+          <el-table-column prop="documentNo" label="单据编号" width="200" align="center" fixed="left" sortable
+          />
+          <el-table-column prop="amount" label="金额" width="150" align="center" sortable
+          />
+          <el-table-column prop="quantity" label="数量" width="120" align="center" sortable
+          />
+          <el-table-column label="币别 " width="120" prop="currency" algin="center" sortable
+          >
             <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="invoiceQuantity" label="发票数量" width="0" align="left"
-/>
-                                <el-table-column label="发票类型" width="0" prop="invoiceType" algin="left"
->
+          <el-table-column prop="invoiceAmount" label="发票金额" width="150" align="center" sortable
+          />
+          <el-table-column prop="invoiceQuantity" label="发票数量" width="120" align="center" sortable
+          />
+          <el-table-column label="发票类型" width="120" prop="invoiceType" algin="center" sortable
+          >
             <template slot-scope="scope">
               {{ scope.row.invoiceType | dynamicText(invoiceTypeOptions) }}
             </template>
           </el-table-column>
-                                <el-table-column label="单据状态" width="0" prop="status" algin="left"
->
+          <el-table-column label="单据状态" width="120" 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="120" 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)" >编辑
+                         @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>
+
+              <el-button type="text"
+                         @click="">撤回申请
+              </el-button>
+              <el-button type="text"
+                         @click="">审核
+              </el-button>
+              <el-button type="text"
+                         @click="">弃审
+              </el-button>
+              <el-button type="text"
+                         @click="">提交
+              </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"/>
@@ -93,19 +118,19 @@ width="150" >
 
 <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',
@@ -118,29 +143,38 @@ width="150" >
         listQuery: {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
+          sort: 'desc',
+          sidx: ''
         },
         formVisible: false,
         exportBoxVisible: false,
         columnList: [
-                    {prop: 'businessDate', label: '业务日期'},
-                    {prop: 'documentNo', label: '单据编号'},
-                    {prop: 'amount', label: '金额'},
-                    {prop: 'quantity', label: '数量'},
-                    {prop: 'currency', label: '币别 '},
-                    {prop: 'invoiceAmount', label: '发票金额'},
-                    {prop: 'invoiceQuantity', label: '发票数量'},
-                    {prop: 'invoiceType', label: '发票类型'},
-                    {prop: 'status', label: '单据状态'},
-                    {prop: 'creatorUserName', label: '制单人'},
+          { prop: 'businessDate', label: '业务日期' },
+          { prop: 'documentNo', label: '单据编号' },
+          { prop: 'amount', label: '金额' },
+          { prop: 'quantity', label: '数量' },
+          { prop: 'currency', label: '币别 ' },
+          { prop: 'invoiceAmount', label: '发票金额' },
+          { prop: 'invoiceQuantity', label: '发票数量' },
+          { prop: 'invoiceType', label: '发票类型' },
+          { prop: 'status', label: '单据状态' },
+          { prop: 'creatorUserName', label: '制单人' }
         ],
-                                invoiceTypeOptions:[{"fullName":"普通增值税发票","id":"1"},{"fullName":"专用增值税发票","id":"2"},{"fullName":"增值税电子普通发票","id":"3"},{"fullName":"增值税电子发票","id":"4"}],
-                            invoiceTypeProps:{"label":"fullName","value":"id"},
-                                currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
-                            currencyProps:{"label":"fullName","value":"id"},
-                                statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],
-                            statusProps:{"label":"fullName","value":"id"},
+        invoiceTypeOptions: [{ 'fullName': '普通增值税发票', 'id': '1' }, {
+          'fullName': '专用增值税发票',
+          'id': '2'
+        }, { 'fullName': '增值税电子普通发票', 'id': '3' }, { 'fullName': '增值税电子发票', 'id': '4' }],
+        invoiceTypeProps: { 'label': 'fullName', 'value': 'id' },
+        currencyOptions: [{ 'fullName': '人民币', 'id': '0' }, { 'fullName': '美元', 'id': '1' }, {
+          'fullName': '英镑',
+          'id': '2'
+        }],
+        currencyProps: { 'label': 'fullName', 'value': 'id' },
+        statusOptions: [{ 'fullName': '已保存', 'id': '0' }, { 'fullName': '审批中', 'id': '1' }, {
+          'fullName': '已审批',
+          'id': '2'
+        }],
+        statusProps: { 'label': 'fullName', 'value': 'id' }
       }
     },
     computed: {
@@ -152,32 +186,38 @@ 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()
       },
       initData() {
-                this.listLoading = true;
+        this.listLoading = true
         let _query = {
           ...this.listQuery,
           ...this.query,
-                    menuId:this.menuId
-                };
+          menuId: this.menuId
+        }
         request({
           url: `/api/invoices/Invoices/getList`,
           method: 'post',
           data: _query
         }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
+          var _list = []
+          for (let i = 0; i < res.data.list.length; i++) {
+
+            res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
+              10) : '';
+            res.data.list[i].businessDate = res.data.list[i].businessDate ? res.data.list[i].businessDate
+              .substring(0, 10) : '';
+
+            let _data = res.data.list[i]
             _list.push(_data)
           }
           this.list = _list
@@ -200,10 +240,10 @@ width="150" >
               onClose: () => {
                 this.initData()
               }
-                        });
+            })
           })
         }).catch(() => {
-                });
+        })
       },
       handleSelectionChange(val) {
         const res = val.map(item => item.id)
@@ -214,7 +254,7 @@ width="150" >
           this.$message({
             type: 'error',
             message: '请选择一条数据',
-                            duration: 1500,
+            duration: 1500
           })
           return
         }
@@ -232,7 +272,7 @@ width="150" >
               onClose: () => {
                 this.initData()
               }
-                            });
+            })
           })
         }).catch(() => {
         })
@@ -250,7 +290,7 @@ 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/invoices/Invoices/Actions/Export`,
           method: 'GET',
@@ -266,8 +306,8 @@ width="150" >
         this.listQuery = {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
+          sort: 'desc',
+          sidx: ''
         }
         this.initData()
       },

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

@@ -2,7 +2,7 @@
   <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="800px">
+             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">

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

@@ -6,7 +6,7 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="设备名称">
-                                        <el-input v-model="query.mName" placeholder="请输入" clearable>  </el-input>
+              <el-input v-model="query.mName" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -32,9 +32,13 @@
           <div>
             <el-button type="primary" 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-download" @click="">导入
+            </el-button>
+            <el-button type="text" icon="el-icon-download" @click="">编辑
+            </el-button>
+            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -45,39 +49,42 @@
             <screenfull isContainer/>
           </div>
         </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="mName" label="设备名称" width="0" align="left"
-/>
-                            <el-table-column prop="serialnumber" label="设备序列号" width="0" align="left"
-/>
-                            <el-table-column prop="monitoringId" label="区域" width="0" align="left"
-/>
-                                <el-table-column label="设备状态：" width="0" prop="mStatus" 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="mName" label="设备名称" width="300" align="center" sortable   fixed="left"
+          />
+          <el-table-column prop="serialnumber" label="设备序列号" width="300" align="center" sortable  fixed="left"
+          />
+          <el-table-column prop="monitoringId" label="区域" width="200" align="center" sortable
+          />
+          <el-table-column label="设备状态：" width="200" prop="mStatus" algin="center" sortable
+          >
             <template slot-scope="scope">
               {{ scope.row.mStatus | dynamicText(mStatusOptions) }}
             </template>
           </el-table-column>
-                            <el-table-column prop="channelNumber" label="设备通道号" width="0" align="left"
-/>
-                                <el-table-column label="是否显示" width="0" prop="isEnable" algin="left"
->
+          <el-table-column prop="channelNumber" label="设备通道号" width="200" align="center" sortable
+          />
+          <el-table-column label="是否显示" width="200" prop="isEnable" algin="center" sortable
+          >
             <template slot-scope="scope">
               {{ scope.row.isEnable | dynamicText(isEnableOptions) }}
             </template>
           </el-table-column>
           <el-table-column label="操作" fixed="right"
-                                         width="100" >
+                           width="100">
             <template slot-scope="scope">
               <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
+                         @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"/>
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+                    @pagination="initData"/>
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
@@ -88,20 +95,20 @@
 
 <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: {
-                                mName:undefined,
-                                monitoringId:undefined,
+          mName: undefined,
+          monitoringId: undefined
         },
         treeProps: {
           children: 'children',
@@ -114,25 +121,25 @@
         listQuery: {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
+          sort: 'desc',
+          sidx: 'creatorTime'
         },
         formVisible: false,
         exportBoxVisible: false,
         columnList: [
-                    {prop: 'mName', label: '设备名称'},
-                    {prop: 'serialnumber', label: '设备序列号'},
-                    {prop: 'monitoringId', label: '区域'},
-                    {prop: 'mStatus', label: '设备状态：'},
-                    {prop: 'channelNumber', label: '设备通道号'},
-                    {prop: 'isEnable', label: '是否显示'},
+          { prop: 'mName', label: '设备名称' },
+          { prop: 'serialnumber', label: '设备序列号' },
+          { prop: 'monitoringId', label: '区域' },
+          { prop: 'mStatus', label: '设备状态：' },
+          { prop: 'channelNumber', label: '设备通道号' },
+          { prop: 'isEnable', label: '是否显示' }
         ],
-                            monitoringIdOptions:[],
-                            monitoringIdProps:{"label":"m_name","value":"id"},
-                                mStatusOptions:[{"fullName":"在线","id":"1"},{"fullName":"不在线","id":"0"}],
-                            mStatusProps:{"label":"fullName","value":"id"},
-                                isEnableOptions:[{"fullName":"显示","id":"1"},{"fullName":"不显示","id":"0"}],
-                            isEnableProps:{"label":"fullName","value":"id"},
+        monitoringIdOptions: [],
+        monitoringIdProps: { 'label': 'm_name', 'value': 'id' },
+        mStatusOptions: [{ 'fullName': '在线', 'id': '1' }, { 'fullName': '不在线', 'id': '0' }],
+        mStatusProps: { 'label': 'fullName', 'value': 'id' },
+        isEnableOptions: [{ 'fullName': '显示', 'id': '1' }, { 'fullName': '不显示', 'id': '0' }],
+        isEnableProps: { 'label': 'fullName', 'value': 'id' }
       }
     },
     computed: {
@@ -142,7 +149,7 @@
     },
     created() {
       this.initData()
-                    this.getmonitoringIdOptions();
+      this.getmonitoringIdOptions()
     },
     methods: {
       getmonitoringIdOptions() {
@@ -151,32 +158,33 @@
           this.monitoringIdOptions = data
         })
       },
-            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()
       },
       initData() {
-                this.listLoading = true;
+        this.listLoading = true
         let _query = {
           ...this.listQuery,
           ...this.query,
-                    menuId:this.menuId
-                };
+          menuId: this.menuId
+        }
         request({
           url: `/api/example/Monitoringitem/getList`,
           method: 'post',
           data: _query
         }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
+          var _list = []
+          for (let i = 0; i < res.data.list.length; i++) {
+            res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0, 10) : '';
+            let _data = res.data.list[i]
             _list.push(_data)
           }
           this.list = _list
@@ -199,10 +207,10 @@
               onClose: () => {
                 this.initData()
               }
-                        });
+            })
           })
         }).catch(() => {
-                });
+        })
       },
       handleSelectionChange(val) {
         const res = val.map(item => item.id)
@@ -213,7 +221,7 @@
           this.$message({
             type: 'error',
             message: '请选择一条数据',
-                            duration: 1500,
+            duration: 1500
           })
           return
         }
@@ -231,7 +239,7 @@
               onClose: () => {
                 this.initData()
               }
-                            });
+            })
           })
         }).catch(() => {
         })
@@ -249,7 +257,7 @@
         })
       },
       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/example/Monitoringitem/Actions/Export`,
           method: 'GET',
@@ -265,8 +273,8 @@
         this.listQuery = {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
+          sort: 'desc',
+          sidx: 'creatorTime'
         }
         this.initData()
       },

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

@@ -1,65 +1,66 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
+  <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="600px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
+             width="800px">
+    <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-col :span="24">
             <el-form-item label-width="0">
               <JNPF-Text :style='{"width":"100%"}'
- :textStyle='{"color":"#000000","font-weight":"normal","text-decoration":"none","font-size":18,"line-height":32,"font-style":"normal","text-align":"left"}' value="自然人档案">
+                         :textStyle='{"color":"#000000","font-weight":"normal","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="24" >
+          <el-col :span="24">
             <el-form-item label="姓名"
- prop="name" >
+                          prop="name">
               <el-input v-model="dataForm.name"
                         placeholder="请输入姓名" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="24" >
+          <el-col :span="24">
             <el-form-item label="地址"
- prop="adress" >
+                          prop="adress">
               <el-input v-model="dataForm.adress"
                         placeholder="请输入地址" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="24" >
+          <el-col :span="24">
             <el-form-item label="手机号"
- prop="contact" >
+                          prop="contact">
               <el-input v-model="dataForm.contact"
                         placeholder="请输入手机号" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="录入人"  
- prop="creatorUserName" >
-                    <el-input    v-model="dataForm.creatorUserName"
- placeholder="请输入录入人"  clearable  :style='{"width":"100%"}'>
+<!--          <el-col :span="12">-->
+<!--            <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="12" >
-                <el-form-item  label="创建时间"  
- prop="creatorTime" >
-                    <el-input    v-model="dataForm.creatorTime"
- placeholder="系统自动生成"  readonly >
+<!--              </el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="创建时间"-->
+<!--                          prop="creatorTime">-->
+<!--              <el-input v-model="dataForm.creatorTime"-->
+<!--                        placeholder="系统自动生成" readonly>-->
 
-                </el-input>
-                </el-form-item>
-            </el-col>
+<!--              </el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </template>
-</el-form>
+      </el-form>
     </el-row>
     <span slot="footer" class="dialog-footer">
         <el-button @click="visible = false"> 取 消</el-button>
@@ -71,6 +72,7 @@
   import request from '@/utils/request'
   import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
   import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+
   export default {
     components: {},
     props: [],
@@ -80,11 +82,11 @@
         loading: false,
         isDetail: false,
         dataForm: {
-                            name : '',
-                            adress : '',
-                            contact : '',
-                            creatorUserName : '',
-                            creatorTime : "",
+          name: '',
+          adress: '',
+          contact: '',
+          creatorUserName: '',
+          creatorTime: ''
         },
         rules:
           {
@@ -93,9 +95,9 @@
                 required: true,
                 message: '请输入姓名',
                 trigger: 'blur'
-                                },
-                        ],
-            },
+              }
+            ]
+          }
 
       }
     },
@@ -103,38 +105,39 @@
     watch: {},
     created() {
     },
-        mounted() {},
+    mounted() {
+    },
     methods: {
-            clearData(data){
+      clearData(data) {
         for (let key in data) {
           if (data[key] instanceof Array) {
-                        data[key] = [];
+            data[key] = []
           } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
+            this.clearData(data[key])
           } else {
-                        data[key] = "";
+            data[key] = ''
           }
         }
       },
       init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
+        this.dataForm.id = id || 0
+        this.visible = true
+        this.isDetail = isDetail || false
         this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
+          this.$refs['elForm'].resetFields()
+          if (this.dataForm.id) {
             this.loading = true
             request({
-                            url: '/api/example/Jg_natural/'+this.dataForm.id,
+              url: '/api/example/Jg_natural/' + this.dataForm.id,
               method: 'get'
             }).then(res => {
               this.dataInfo(res.data)
               this.loading = false
-                        });
-                    }else{
+            })
+          } else {
             this.clearData(this.dataForm)
           }
-                });
+        })
         this.$store.commit('generator/UPDATE_RELATION_DATA', {})
       },
       // 表单提交
@@ -146,7 +149,7 @@
         })
       },
       request() {
-                var _data =this.dataList()
+        var _data = this.dataList()
         if (!this.dataForm.id) {
           request({
             url: '/api/example/Jg_natural',
@@ -163,9 +166,9 @@
               }
             })
           })
-                }else{
+        } else {
           request({
-                        url: '/api/example/Jg_natural/'+this.dataForm.id,
+            url: '/api/example/Jg_natural/' + this.dataForm.id,
             method: 'PUT',
             data: _data
           }).then((res) => {
@@ -181,15 +184,15 @@
           })
         }
       },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                return _data;
+      dataList() {
+        var _data = JSON.parse(JSON.stringify(this.dataForm))
+        return _data
       },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
+      dataInfo(dataAll) {
+        let _dataAll = dataAll
         this.dataForm = _dataAll
-            },
-        },
+      }
+    }
   }
 
 </script>

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

@@ -6,12 +6,12 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="姓名">
-                                        <el-input v-model="query.name" placeholder="请输入" clearable>  </el-input>
+              <el-input v-model="query.name" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="手机号">
-                                        <el-input v-model="query.contact" placeholder="请输入" clearable>  </el-input>
+              <el-input v-model="query.contact" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -27,9 +27,11 @@
           <div>
             <el-button type="primary" 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-download" @click="">导入
+            </el-button>
+            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -40,29 +42,32 @@
             <screenfull isContainer/>
           </div>
         </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="name" label="姓名" width="0" align="left"
-/>
-                            <el-table-column prop="adress" label="地址" width="0" align="left"
-/>
-                            <el-table-column prop="contact" label="手机号" width="0" align="left"
-/>
-                            <el-table-column prop="creatorUserName" label="录入人" width="0" align="left"
-/>
-                            <el-table-column prop="creatorTime" 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="name" label="姓名" width="300" align="center" fixed="left" sortable
+          />
+          <el-table-column prop="adress" label="地址" width="300" align="center" sortable
+          />
+          <el-table-column prop="contact" label="手机号" width="300" align="center" sortable
+          />
+          <el-table-column prop="creatorUserName" label="录入人" width="300" align="center" sortable
+          />
+          <el-table-column prop="creatorTime" label="创建时间" width="300" align="center" sortable
+          />
           <el-table-column label="操作" fixed="right"
-                                         width="100" >
+                           width="100">
             <template slot-scope="scope">
               <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
+                         @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"/>
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+                    @pagination="initData"/>
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
@@ -73,20 +78,20 @@
 
 <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: {
-                                name:undefined,
-                                contact:undefined,
+          name: undefined,
+          contact: undefined
         },
         treeProps: {
           children: 'children',
@@ -99,18 +104,18 @@
         listQuery: {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
+          sort: 'desc',
+          sidx: 'creatorTime'
         },
         formVisible: false,
         exportBoxVisible: false,
         columnList: [
-                    {prop: 'name', label: '姓名'},
-                    {prop: 'adress', label: '地址'},
-                    {prop: 'contact', label: '手机号'},
-                    {prop: 'creatorUserName', label: '录入人'},
-                    {prop: 'creatorTime', label: '创建时间'},
-                ],
+          { prop: 'name', label: '姓名' },
+          { prop: 'adress', label: '地址' },
+          { prop: 'contact', label: '手机号' },
+          { prop: 'creatorUserName', label: '录入人' },
+          { prop: 'creatorTime', label: '创建时间' }
+        ]
       }
     },
     computed: {
@@ -122,32 +127,32 @@
       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()
       },
       initData() {
-                this.listLoading = true;
+        this.listLoading = true
         let _query = {
           ...this.listQuery,
           ...this.query,
-                    menuId:this.menuId
-                };
+          menuId: this.menuId
+        }
         request({
           url: `/api/example/Jg_natural/getList`,
           method: 'post',
           data: _query
         }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
+          var _list = []
+          for (let i = 0; i < res.data.list.length; i++) {
+            let _data = res.data.list[i]
             _list.push(_data)
           }
           this.list = _list
@@ -170,10 +175,10 @@
               onClose: () => {
                 this.initData()
               }
-                        });
+            })
           })
         }).catch(() => {
-                });
+        })
       },
       handleSelectionChange(val) {
         const res = val.map(item => item.id)
@@ -184,7 +189,7 @@
           this.$message({
             type: 'error',
             message: '请选择一条数据',
-                            duration: 1500,
+            duration: 1500
           })
           return
         }
@@ -202,7 +207,7 @@
               onClose: () => {
                 this.initData()
               }
-                            });
+            })
           })
         }).catch(() => {
         })
@@ -220,7 +225,7 @@
         })
       },
       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/example/Jg_natural/Actions/Export`,
           method: 'GET',
@@ -236,8 +241,8 @@
         this.listQuery = {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
+          sort: 'desc',
+          sidx: 'creatorTime'
         }
         this.initData()
       },

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

@@ -8,7 +8,7 @@
 					<el-col :span="8">
 						<el-form-item label="单据编号" prop="documentNo">
 							<el-input v-model="dataForm.documentNo" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+								:style='{"width":"100%"}'  :disabled="true">
 
 							</el-input>
 						</el-form-item>
@@ -17,7 +17,7 @@
 						<el-form-item label="采购订单" prop="purchaseOrderId">
 							<popupSelect v-model="dataForm.purchaseOrderId" placeholder="请选择" clearable
 								field="purchaseOrderId" interfaceId="383149471917185157"
-								:columnOptions="purchaseOrderIdcolumnOptions" propsValue="id"
+								:columnOptions="purchaseOrderIdcolumnOptions" :excludeFields="excludeFields" propsValue="id"
 								relationField="document_no" popupType="dialog" popupTitle="选择数据" popupWidth="800px" @change="popupSelectChange">
 
 							</popupSelect>
@@ -35,14 +35,14 @@
 					</el-col>
 					<el-col :span="8">
 						<el-form-item label="退货金额" prop="refundAmount">
-							<el-input v-model="dataForm.refundAmount" clearable :style='{"width":"100%"}'>
+							<el-input v-model="dataForm.refundAmount" clearable :style='{"width":"100%"}'  :disabled="true">
 
 							</el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
 						<el-form-item label="退货数量" prop="refundNum">
-							<el-input v-model="dataForm.refundNum" clearable :style='{"width":"100%"}'>
+							<el-input v-model="dataForm.refundNum" clearable :style='{"width":"100%"}'  :disabled="true">
 
 							</el-input>
 						</el-form-item>
@@ -68,7 +68,7 @@
 												<template slot-scope="scope">
 													<popupSelect v-model="scope.row.licenseNum" placeholder="请选择"
 														clearable :field="'licenseNum'+scope.$index"
-														interfaceId="383214061812227333"
+														interfaceId="383214061812227333" :excludeFields="excludeFields"
 														:bissId="dataForm.purchaseOrderId"
 														:columnOptions="purchaseback_item0licenseNumcolumnOptions"
 														propsValue="license_num" relationField="license_num"
@@ -187,6 +187,7 @@
 		data() {
 			return {
 				bissId: '380716763022647941',
+        excludeFields: [],
 				formVisible: false,
 				visible: false,
 				loading: false,
@@ -324,7 +325,10 @@
 		mounted() {},
 		methods: {
 			popupSelectChange2(a, b){
+        var excludeFields = [];
+
 				for (let i = 0; i < this.dataForm.purchaseback_item0List.length; i++) {
+          excludeFields.push(this.dataForm.purchaseback_item0List[i].licenseNo);
 					if(a == this.dataForm.purchaseback_item0List[i].licenseNum){
 						this.dataForm.purchaseback_item0List[i].materialName = b.material_name;
 						this.dataForm.purchaseback_item0List[i].settlement = b.settlement;
@@ -337,9 +341,12 @@
 						this.dataForm.purchaseback_item0List[i].pountType = b.pount_type;
 					}
 				}
+        this.excludeFields = excludeFields;
 			},
 			popupSelectChange(e,d){
 				this.dataForm.currency = d.currency;
+        this.excludeFields = [];
+        this.dataForm.receiptout_item0List = [];
 			},
   			purchaseback_item0Exist() {
 				let isOk = true;

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

@@ -6,7 +6,7 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="单据编号">
-							<el-input v-model="query.documentNo" placeholder="请输入" clearable> </el-input>
+              <el-input v-model="query.documentNo" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -22,6 +22,10 @@
           <div>
             <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
             </el-button>
+            <el-button type="text" icon="el-icon-download" @click="">编辑
+            </el-button>
+            <el-button type="text" icon="el-icon-download" @click="">查看
+            </el-button>
             <el-button type="text" icon="el-icon-download" @click="exportData()">导出
             </el-button>
             <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
@@ -30,32 +34,33 @@
           <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()" />
+                       @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="jg_purchaseorder.contractName" label="合同名称" width="0" align="left" />
-					<el-table-column prop="jg_purchaseorder.supplierName" label="供应商名称" width="0" align="left" />
-					<el-table-column prop="refundAmount" label="退货金额" width="0" align="left" />
-					<el-table-column prop="actualAmount" 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="单据编号" width="200" align="center"sortable fixed="left" />
+          <el-table-column prop="jg_purchaseorder.contractName" label="合同名称" width="200" align="center"sortable/>
+          <el-table-column prop="jg_purchaseorder.supplierName" label="供应商名称" width="200" align="center"sortable/>
+          <el-table-column prop="refundAmount" label="退货金额" width="120" align="center"sortable/>
+          <el-table-column prop="actualAmount" label="实退金额" width="120" align="center"sortable/>
+          <el-table-column label="币别 " width="120" prop="currency" algin="center" sortable>
             <template slot-scope="scope">
               {{ scope.row.currency | dynamicText(currencyOptions) }}
             </template>
           </el-table-column>
-					<el-table-column prop="refundNum" label="退货数量" width="0" align="left" />
-					<el-table-column label="单据状态 " width="0" prop="status" algin="left">
+          <el-table-column prop="refundNum" label="退货数量" width="120" align="center"sortable/>
+          <el-table-column label="单据状态 " width="120" prop="status" algin="center">
             <template slot-scope="scope">
               {{ scope.row.status | dynamicText(statusOptions) }}
             </template>
           </el-table-column>
-					<el-table-column prop="creatorTime" label="创建时间" width="0" align="left" />
-					<el-table-column prop="creatorUserName" label="创建人" width="0" align="left" />
-					<el-table-column prop="remark" label="备注" width="0" align="left" />
+          <el-table-column prop="creatorTime" label="创建时间" width="120" align="center"sortable/>
+          <el-table-column prop="creatorUserName" label="创建人" width="120" align="center"sortable/>
+          <el-table-column prop="remark" label="备注" width="0" align="center"sortable/>
           <el-table-column label="操作" fixed="right" width="150">
             <template slot-scope="scope">
               <el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
@@ -68,12 +73,12 @@
           </el-table-column>
         </JNPF-table>
         <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
-					@pagination="initData" />
+                    @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>
 
@@ -99,7 +104,7 @@
       return {
         detailVisible: false,
         query: {
-					documentNo: undefined,
+          documentNo: undefined
         },
         treeProps: {
           children: 'children',
@@ -113,8 +118,8 @@
         listQuery: {
           currentPage: 1,
           pageSize: 20,
-					sort: "desc",
-					sidx: "",
+          sort: 'desc',
+          sidx: ''
         },
         formVisible: false,
         exportBoxVisible: false,
@@ -161,36 +166,36 @@
           {
             prop: 'remark',
             label: '备注'
-					},
+          }
         ],
         currencyOptions: [{
-					"fullName": "人民币",
-					"id": "0"
+          'fullName': '人民币',
+          'id': '0'
         }, {
-					"fullName": "美元",
-					"id": "1"
+          'fullName': '美元',
+          'id': '1'
         }, {
-					"fullName": "英镑",
-					"id": "2"
+          'fullName': '英镑',
+          'id': '2'
         }],
         currencyProps: {
-					"label": "fullName",
-					"value": "id"
+          'label': 'fullName',
+          'value': 'id'
         },
         statusOptions: [{
-					"fullName": "已保存",
-					"id": "0"
+          'fullName': '已保存',
+          'id': '0'
         }, {
-					"fullName": "审批中",
-					"id": "1"
+          'fullName': '审批中',
+          'id': '1'
         }, {
-					"fullName": "已审批",
-					"id": "2"
+          'fullName': '已审批',
+          'id': '2'
         }],
         statusProps: {
-					"label": "fullName",
-					"value": "id"
-				},
+          'label': 'fullName',
+          'value': 'id'
+        }
       }
     },
     computed: {
@@ -218,20 +223,23 @@
         this.initData()
       },
       initData() {
-				this.listLoading = true;
+        this.listLoading = true
         let _query = {
           ...this.listQuery,
           ...this.query,
           menuId: this.menuId
-				};
+        }
         request({
           url: `/api/purchaseback/Purchaseback/getList`,
           method: 'post',
           data: _query
         }).then(res => {
-					var _list = [];
+          var _list = []
           for (let i = 0; i < res.data.list.length; i++) {
-						let _data = res.data.list[i];
+            res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
+              10) : '';
+
+            let _data = res.data.list[i]
             _list.push(_data)
           }
           this.list = _list
@@ -254,9 +262,10 @@
               onClose: () => {
                 this.initData()
               }
-						});
             })
-				}).catch(() => {});
+          })
+        }).catch(() => {
+        })
       },
       handleSelectionChange(val) {
         const res = val.map(item => item.id)
@@ -267,7 +276,7 @@
           this.$message({
             type: 'error',
             message: '请选择一条数据',
-						duration: 1500,
+            duration: 1500
           })
           return
         }
@@ -285,9 +294,10 @@
               onClose: () => {
                 this.initData()
               }
-						});
             })
-				}).catch(() => {})
+          })
+        }).catch(() => {
+        })
       },
       addOrUpdateHandle(id, isDetail) {
         this.formVisible = true
@@ -323,8 +333,8 @@
         this.listQuery = {
           currentPage: 1,
           pageSize: 20,
-					sort: "desc",
-					sidx: "",
+          sort: 'desc',
+          sidx: ''
         }
         this.initData()
       },

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

@@ -6,7 +6,7 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="单据编号">
-                                        <el-input v-model="query.documentNo" placeholder="请输入" clearable>  </el-input>
+              <el-input v-model="query.documentNo" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -22,14 +22,27 @@
           <div>
             <el-button type="primary" 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-download" @click="">查看
             </el-button>
-                                    <el-button type="primary" icon="el-icon-plus"  @click="pigeonhole()">归档
+            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
+            </el-button>
+            <el-button type="text" icon="el-icon-download" @click="">导入
+            </el-button>
+            <el-button type="text" icon="el-icon-download" @click="">开票文件下载
+            </el-button>
+            <el-button type="text" icon="el-icon-download" @click="">发票录入
+            </el-button>
+            <el-button type="text" icon="el-icon-download" @click="">入库
             </el-button>
             <el-button type="primary" icon="el-icon-plus" @click="paymentApply()">付款申请
             </el-button>
+
+            <el-button type="primary" icon="el-icon-plus" @click="pigeonhole()">归档
+            </el-button>
+            <el-button type="text" icon="el-icon-download" @click="">转销售
+            </el-button>
           </div>
           <div class="JNPF-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
@@ -39,57 +52,64 @@
             <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="erpNo" label="ERP订单号" width="0" align="left"
-/>
-                            <el-table-column prop="contractName" label="合同名称" width="0" align="left"
-/>
-                            <el-table-column prop="supplierName" label="供应商名称" width="0" align="left"
-/>
-                            <el-table-column prop="amount" 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="单据编号" width="200" align="center" fixed="left" sortable 
+          />
+          <el-table-column prop="erpNo" label="ERP订单号" width="200" align="center" fixed="left" sortable
+          />
+          <el-table-column prop="contractName" label="合同名称" width="120" align="center" fixed="left" sortable
+          />
+          <el-table-column prop="supplierName" label="供应商名称" width="220" align="center" sortable
+          />
+          <el-table-column prop="amount" label="金额" width="120" align="center" sortable
+          />
+          <el-table-column prop="num" label="重量" width="120" align="center" sortable
+          />
+          <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="payPrice" 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 prop="advanceAmount" label="垫资金额" width="0" align="left"
-/>
-                            <el-table-column prop="creatorTime" label="制单时间" width="0" align="left"
-/>
-                                <el-table-column label="单据状态 " width="0" prop="status" algin="left"
->
-                                    <template slot-scope="scope">
+          <el-table-column prop="payPrice" label="已付款金额" width="120" align="center" sortable
+          />
+          <el-table-column prop="invoiceNum" label="发票数量" width="120" align="center" sortable
+          />
+          <el-table-column prop="invoiceAmount" label="发票金额" width="120" align="center" sortable
+          />
+          <el-table-column prop="advanceAmount" label="垫资金额" width="120" align="center" sortable
+          />
+          <el-table-column prop="creatorTime" label="制单时间" width="120" align="center" sortable sortable="custom"
+          />
+          <el-table-column label="单据状态 " width="120" 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="120" align="center" sortable
+          />
           <el-table-column label="操作" fixed="right"
-                                         width="100" >
+                           width="150">
             <template slot-scope="scope">
               <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
+                         @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>
+              <el-button type="text" @click="">发票上传
+              </el-button>
+              <el-button type="text" @click="">退货
+              </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"/>
@@ -100,15 +120,15 @@
 
 <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'
   import pament from '@/views/scm/basicInformation/paymentdoc/Form'
 
   export default {
-        components: {JNPFForm, ExportBox,Detail},
+    components: { JNPFForm, ExportBox, Detail },
     // routes:[
     //   {
     //     path:'/paymentdoc',
@@ -120,7 +140,7 @@
       return {
         detailVisible: false,
         query: {
-                                documentNo:undefined,
+          documentNo: undefined
         },
         treeProps: {
           children: 'children',
@@ -133,31 +153,37 @@
         listQuery: {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
+          sort: 'desc',
+          sidx: ''
         },
         formVisible: false,
         exportBoxVisible: false,
         columnList: [
-                    {prop: 'documentNo', label: '单据编号'},
-                    {prop: 'erpNo', label: 'ERP订单号'},
-                    {prop: 'contractName', label: '合同名称'},
-                    {prop: 'supplierName', label: '供应商名称'},
-                    {prop: 'amount', label: '金额'},
-                    {prop: 'num', label: '重量'},
-                    {prop: 'currency', label: '币种'},
-                    {prop: 'payPrice', label: '已付款金额'},
-                    {prop: 'invoiceNum', label: '发票数量'},
-                    {prop: 'invoiceAmount', label: '发票金额'},
-                    {prop: 'advanceAmount', label: '垫资金额'},
-                    {prop: 'creatorTime', label: '制单时间'},
-                    {prop: 'status', label: '单据状态 '},
-                    {prop: 'creatorUserName', label: '制单人'},
+          { prop: 'documentNo', label: '单据编号' },
+          { prop: 'erpNo', label: 'ERP订单号' },
+          { prop: 'contractName', label: '合同名称' },
+          { prop: 'supplierName', label: '供应商名称' },
+          { prop: 'amount', label: '金额' },
+          { prop: 'num', label: '重量' },
+          { prop: 'currency', label: '币种' },
+          { prop: 'payPrice', label: '已付款金额' },
+          { prop: 'invoiceNum', label: '发票数量' },
+          { prop: 'invoiceAmount', label: '发票金额' },
+          { prop: 'advanceAmount', label: '垫资金额' },
+          { prop: 'creatorTime', label: '制单时间' },
+          { prop: 'status', label: '单据状态 ' },
+          { prop: 'creatorUserName', label: '制单人' }
         ],
-                                currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
-                            currencyProps:{"label":"fullName","value":"id"},
-                                statusOptions:[{"fullName":"待开票","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款中","id":"2"},{"fullName":"归档","id":"3"}],
-                            statusProps:{"label":"fullName","value":"id"},
+        currencyOptions: [{ 'fullName': '人民币', 'id': '0' }, { 'fullName': '美元', 'id': '1' }, {
+          'fullName': '英镑',
+          'id': '2'
+        }],
+        currencyProps: { 'label': 'fullName', 'value': 'id' },
+        statusOptions: [{ 'fullName': '待开票', 'id': '0' }, { 'fullName': '开票中', 'id': '1' }, {
+          'fullName': '付款中',
+          'id': '2'
+        }, { 'fullName': '归档', 'id': '3' }],
+        statusProps: { 'label': 'fullName', 'value': 'id' }
       }
     },
     computed: {
@@ -169,32 +195,35 @@
       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()
       },
       initData() {
-                this.listLoading = true;
+        this.listLoading = true
         let _query = {
           ...this.listQuery,
           ...this.query,
-                    menuId:this.menuId
-                };
+          menuId: this.menuId
+        }
         request({
           url: `/api/purchaseorder/Purchaseorder/getList`,
           method: 'post',
           data: _query
         }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
+          var _list = []
+          for (let i = 0; i < res.data.list.length; i++) {
+            res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
+              10) : '';
+
+            let _data = res.data.list[i]
             _list.push(_data)
           }
           this.list = _list
@@ -217,10 +246,10 @@
               onClose: () => {
                 this.initData()
               }
-                        });
+            })
           })
         }).catch(() => {
-                });
+        })
       },
       handleSelectionChange(val) {
         const res = val.map(item => item.id)
@@ -231,7 +260,7 @@
           this.$message({
             type: 'error',
             message: '请选择一条数据',
-                            duration: 1500,
+            duration: 1500
           })
           return
         }
@@ -249,7 +278,7 @@
               onClose: () => {
                 this.initData()
               }
-                            });
+            })
           })
         }).catch(() => {
         })
@@ -260,19 +289,19 @@
           this.$refs.JNPFForm.init(id, isDetail)
         })
       },
-            pigeonhole(){
+      pigeonhole() {
         if (!this.multipleSelection.length) {
           this.$message({
             type: 'error',
             message: '请选择一条数据',
-                  duration: 1500,
+            duration: 1500
           })
           return
         }
         let id = this.multipleSelection.join()
-              let param ={};
+        let param = {}
         param = this.list.find(function(param) {
-                return param.id == id;
+          return param.id == id
         })
         request({
           url: `/api/purchaseorder/Purchaseorder/pigeonhole`,
@@ -285,22 +314,22 @@
             onClose: () => {
               this.initData()
             }
-                });
+          })
         })
       },
-          paymentApply(){
+      paymentApply() {
         if (!this.multipleSelection.length) {
           this.$message({
             type: 'error',
             message: '请选择一条数据',
-                duration: 1500,
+            duration: 1500
           })
           return
         }
         let ids = this.multipleSelection.join()
         request({
           url: `/api/purchaseorder/Purchaseorder/paymentapply/${ids}`,
-              method: 'put',
+          method: 'put'
         }).then(res => {
           this.$message({
             type: 'success',
@@ -308,9 +337,9 @@
             onClose: () => {
               this.initData()
             }
-              });
           })
-/*              if (info.amount != info.invoiceAmount){
+        })
+        /*              if (info.amount != info.invoiceAmount){
                         this.$message({
                           type: 'error',
                           message: '请先开具发票',
@@ -335,7 +364,7 @@
         })
       },
       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/purchaseorder/Purchaseorder/Actions/Export`,
           method: 'GET',
@@ -351,8 +380,8 @@
         this.listQuery = {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
+          sort: 'desc',
+          sidx: ''
         }
         this.initData()
       },

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

@@ -1,71 +1,74 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
+  <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="600px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
+             width="1000px">
+    <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-col :span="24">
             <el-form-item label="库区编码"
- prop="areacode" >
+                          prop="areacode">
               <el-input v-model="dataForm.areacode"
                         placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="24" >
+          <el-col :span="24">
             <el-form-item label="库区名称"
- prop="areaname" >
+                          prop="areaname">
               <el-input v-model="dataForm.areaname"
                         placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="24" >
+          <el-col :span="24">
             <el-form-item label="最高库存"
- prop="maximum" >
+                          prop="maximum">
               <el-input-number v-model="dataForm.maximum"
- placeholder="数字文本"  :step="1" >
+                               placeholder="数字文本" :step="1">
 
               </el-input-number>
             </el-form-item>
           </el-col>
-            <el-col :span="24" >
+          <el-col :span="24">
             <el-form-item label="安全库存"
- prop="safety" >
+                          prop="safety">
               <el-input-number v-model="dataForm.safety"
- placeholder="数字文本"  :step="1" >
+                               placeholder="数字文本" :step="1">
 
               </el-input-number>
             </el-form-item>
           </el-col>
-            <el-col :span="24" >
+          <el-col :span="24">
             <el-form-item label="最低库存"
- prop="minimum" >
+                          prop="minimum">
               <el-input-number v-model="dataForm.minimum"
- placeholder="数字文本"  :step="1" >
+                               placeholder="数字文本" :step="1">
 
               </el-input-number>
             </el-form-item>
           </el-col>
-            <el-col :span="24" >
+          <el-col :span="24">
             <el-form-item label="计量单位"
- prop="unit" >
+                          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="24" >
+          <el-col :span="24">
             <el-form-item label="仓库"
- prop="warehouseId" >
+                          prop="warehouseId">
               <popupSelect v-model="dataForm.warehouseId"
- placeholder="请选择"  field="warehouseId" interfaceId="394860934465658373" :columnOptions="warehouseIdcolumnOptions" propsValue="id" relationField="NAME" popupType="dialog"
+                           placeholder="请选择" field="warehouseId" interfaceId="394860934465658373"
+                           :columnOptions="warehouseIdcolumnOptions" propsValue="id" relationField="NAME"
+                           popupType="dialog"
                            popupTitle="选择数据" popupWidth="800px"
               >
 
@@ -73,7 +76,7 @@
             </el-form-item>
           </el-col>
         </template>
-</el-form>
+      </el-form>
     </el-row>
     <span slot="footer" class="dialog-footer">
         <el-button @click="visible = false"> 取 消</el-button>
@@ -85,6 +88,7 @@
   import request from '@/utils/request'
   import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
   import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+
   export default {
     components: {},
     props: [],
@@ -94,28 +98,45 @@
         loading: false,
         isDetail: false,
         dataForm: {
-                            areacode : '',
-                            areaname : '',
-                            maximum : 1,
-                            safety : 1,
-                            minimum : 1,
-                            unit : "",
-                            warehouseId : "",
-                            creatorTime : "",
-                            lastModifyTime : "",
+          areacode: '',
+          areaname: '',
+          maximum: 1,
+          safety: 1,
+          minimum: 1,
+          unit: '',
+          warehouseId: '',
+          creatorTime: '',
+          lastModifyTime: ''
         },
         rules:
           {
-                            warehouseId: [
+            areacode: [
               {
                 required: true,
-                                    message: '请选择',
+                message: '请选择库区编码',
                 trigger: 'change'
-                                },
+              }
+            ],
+            areaname: [
+              {
+                required: true,
+                message: '请选择库区名称',
+                trigger: 'change'
+              }
             ],
+            warehouseId: [
+              {
+                required: true,
+                message: '请选择仓库',
+                trigger: 'change'
+              }
+            ]
           },
-                        unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
-                    warehouseIdcolumnOptions:[ {"label":"仓库名称","value":"NAME"}, {"label":"ERP库存组织名称","value":"inventory_org_name"}, {"label":"ERP库存组织详情名称","value":"inventory_org_detail_name"},],
+        unitOptions: [{ 'fullName': '吨', 'id': '0' }, { 'fullName': '千克', 'id': '1' }],
+        warehouseIdcolumnOptions: [{ 'label': '仓库名称', 'value': 'NAME' }, {
+          'label': 'ERP库存组织名称',
+          'value': 'inventory_org_name'
+        }, { 'label': 'ERP库存组织详情名称', 'value': 'inventory_org_detail_name' }]
 
       }
     },
@@ -123,38 +144,39 @@
     watch: {},
     created() {
     },
-        mounted() {},
+    mounted() {
+    },
     methods: {
-            clearData(data){
+      clearData(data) {
         for (let key in data) {
           if (data[key] instanceof Array) {
-                        data[key] = [];
+            data[key] = []
           } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
+            this.clearData(data[key])
           } else {
-                        data[key] = "";
+            data[key] = ''
           }
         }
       },
       init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
+        this.dataForm.id = id || 0
+        this.visible = true
+        this.isDetail = isDetail || false
         this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
+          this.$refs['elForm'].resetFields()
+          if (this.dataForm.id) {
             this.loading = true
             request({
-                            url: '/api/example/Reservoirarea/'+this.dataForm.id,
+              url: '/api/example/Reservoirarea/' + this.dataForm.id,
               method: 'get'
             }).then(res => {
               this.dataInfo(res.data)
               this.loading = false
-                        });
-                    }else{
+            })
+          } else {
             this.clearData(this.dataForm)
           }
-                });
+        })
         this.$store.commit('generator/UPDATE_RELATION_DATA', {})
       },
       // 表单提交
@@ -166,7 +188,7 @@
         })
       },
       request() {
-                var _data =this.dataList()
+        var _data = this.dataList()
         if (!this.dataForm.id) {
           request({
             url: '/api/example/Reservoirarea',
@@ -183,9 +205,9 @@
               }
             })
           })
-                }else{
+        } else {
           request({
-                        url: '/api/example/Reservoirarea/'+this.dataForm.id,
+            url: '/api/example/Reservoirarea/' + this.dataForm.id,
             method: 'PUT',
             data: _data
           }).then((res) => {
@@ -201,15 +223,15 @@
           })
         }
       },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                return _data;
+      dataList() {
+        var _data = JSON.parse(JSON.stringify(this.dataForm))
+        return _data
       },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
+      dataInfo(dataAll) {
+        let _dataAll = dataAll
         this.dataForm = _dataAll
-            },
-        },
+      }
+    }
   }
 
 </script>

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

@@ -6,12 +6,12 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="库区编码">
-                                        <el-input v-model="query.areacode" placeholder="请输入" clearable>  </el-input>
+              <el-input v-model="query.areacode" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="库区名称">
-                                        <el-input v-model="query.areaname" placeholder="请输入" clearable>  </el-input>
+              <el-input v-model="query.areaname" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -27,9 +27,13 @@
           <div>
             <el-button type="primary" 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-download" @click="">导入
+            </el-button>
+
+            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -40,37 +44,40 @@
             <screenfull isContainer/>
           </div>
         </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="areacode" label="库区编码" width="0" align="left"
-/>
-                            <el-table-column prop="areaname" label="库区名称" width="0" align="left"
-/>
-                            <el-table-column prop="maximum" label="最高库存" width="0" align="left"
-/>
-                            <el-table-column prop="safety" label="安全库存" width="0" align="left"
-/>
-                            <el-table-column prop="minimum" label="最低库存" width="0" align="left"
-/>
-                                <el-table-column label="计量单位" width="0" prop="unit" 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="areacode" label="库区编码" width="200" align="center" sortable fixed="left"
+          />
+          <el-table-column prop="areaname" label="库区名称" width="200" align="center" sortable fixed="left"
+          />
+          <el-table-column prop="maximum" label="最高库存" width="200" align="center" sortable
+          />
+          <el-table-column prop="safety" label="安全库存" width="200" align="center" sortable
+          />
+          <el-table-column prop="minimum" label="最低库存" width="200" align="center" sortable
+          />
+          <el-table-column label="计量单位" width="200" prop="unit" algin="center" sortable
+          >
             <template slot-scope="scope">
               {{ scope.row.unit | dynamicText(unitOptions) }}
             </template>
           </el-table-column>
-                            <el-table-column prop="warehouseId" label="仓库" width="0" align="left"
-/>
+          <el-table-column prop="warehouseId" label="仓库" width="200" align="center" sortable
+          />
           <el-table-column label="操作" fixed="right"
-                                         width="100" >
+                           width="100">
             <template slot-scope="scope">
               <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
+                         @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"/>
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+                    @pagination="initData"/>
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
@@ -81,20 +88,20 @@
 
 <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: {
-                                areacode:undefined,
-                                areaname:undefined,
+          areacode: undefined,
+          areaname: undefined
         },
         treeProps: {
           children: 'children',
@@ -107,22 +114,22 @@
         listQuery: {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
+          sort: 'desc',
+          sidx: 'creatorTime'
         },
         formVisible: false,
         exportBoxVisible: false,
         columnList: [
-                    {prop: 'areacode', label: '库区编码'},
-                    {prop: 'areaname', label: '库区名称'},
-                    {prop: 'maximum', label: '最高库存'},
-                    {prop: 'safety', label: '安全库存'},
-                    {prop: 'minimum', label: '最低库存'},
-                    {prop: 'unit', label: '计量单位'},
-                    {prop: 'warehouseId', label: '仓库'},
+          { prop: 'areacode', label: '库区编码' },
+          { prop: 'areaname', label: '库区名称' },
+          { prop: 'maximum', label: '最高库存' },
+          { prop: 'safety', label: '安全库存' },
+          { prop: 'minimum', label: '最低库存' },
+          { prop: 'unit', label: '计量单位' },
+          { prop: 'warehouseId', label: '仓库' }
         ],
-                                unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
-                            unitProps:{"label":"fullName","value":"id"},
+        unitOptions: [{ 'fullName': '吨', 'id': '0' }, { 'fullName': '千克', 'id': '1' }],
+        unitProps: { 'label': 'fullName', 'value': 'id' }
       }
     },
     computed: {
@@ -134,32 +141,33 @@
       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()
       },
       initData() {
-                this.listLoading = true;
+        this.listLoading = true
         let _query = {
           ...this.listQuery,
           ...this.query,
-                    menuId:this.menuId
-                };
+          menuId: this.menuId
+        }
         request({
           url: `/api/example/Reservoirarea/getList`,
           method: 'post',
           data: _query
         }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
+          var _list = []
+          for (let i = 0; i < res.data.list.length; i++) {
+            res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0, 10) : '';
+            let _data = res.data.list[i]
             _list.push(_data)
           }
           this.list = _list
@@ -182,10 +190,10 @@
               onClose: () => {
                 this.initData()
               }
-                        });
+            })
           })
         }).catch(() => {
-                });
+        })
       },
       handleSelectionChange(val) {
         const res = val.map(item => item.id)
@@ -196,7 +204,7 @@
           this.$message({
             type: 'error',
             message: '请选择一条数据',
-                            duration: 1500,
+            duration: 1500
           })
           return
         }
@@ -214,7 +222,7 @@
               onClose: () => {
                 this.initData()
               }
-                            });
+            })
           })
         }).catch(() => {
         })
@@ -232,7 +240,7 @@
         })
       },
       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/example/Reservoirarea/Actions/Export`,
           method: 'GET',
@@ -248,8 +256,8 @@
         this.listQuery = {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
+          sort: 'desc',
+          sidx: 'creatorTime'
         }
         this.initData()
       },

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

@@ -8,7 +8,7 @@
 					<el-col :span="8">
 						<el-form-item label="单据编号" prop="documentNo">
 							<el-input v-model="dataForm.documentNo" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+								:style='{"width":"100%"}'  :disabled="true">
 
 							</el-input>
 						</el-form-item>
@@ -17,7 +17,7 @@
 						<el-form-item label="销售订单" prop="salesOrderId">
 							<popupSelect v-model="dataForm.salesOrderId" placeholder="请选择" clearable
 								field="salesOrderId" interfaceId="383568951197606085"
-								:columnOptions="salesOrderIdcolumnOptions" propsValue="id" relationField="document_no"
+								:columnOptions="salesOrderIdcolumnOptions" :excludeFields="excludeFields" propsValue="id" relationField="document_no"
 								popupType="dialog" popupTitle="选择数据" popupWidth="800px" @change="popupSelectChange">
 
 							</popupSelect>
@@ -34,15 +34,15 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
-						<el-form-item label="退款金额" prop="refundAmount">
-							<el-input v-model="dataForm.refundAmount" readonly clearable :style='{"width":"100%"}'>
+						<el-form-item label="退款金额" prop="refundAmount"  >
+							<el-input v-model="dataForm.refundAmount" readonly clearable :style='{"width":"100%"}' :disabled="true">
 
 							</el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
-						<el-form-item label="退货数量" prop="refundNum">
-							<el-input v-model="dataForm.refundNum" readonly clearable :style='{"width":"100%"}'>
+						<el-form-item label="退货数量" prop="refundNum" >
+							<el-input v-model="dataForm.refundNum" readonly clearable :style='{"width":"100%"}' :disabled="true">
 
 							</el-input>
 						</el-form-item>
@@ -68,7 +68,7 @@
 												<template slot-scope="scope">
 													<popupSelect v-model="scope.row.licenseNum" placeholder="请选择"
 														clearable :field="'licenseNum'+scope.$index"
-														interfaceId="383568082196537541" :bissId="dataForm.salesOrderId"
+														interfaceId="383568082196537541" :bissId="dataForm.salesOrderId" :excludeFields="excludeFields"
 														:columnOptions="saleback_item0licenseNumcolumnOptions"
 														propsValue="license_num" relationField="license_num"
 														popupType="dialog" popupWidth="800px" @change="popupSelectChange2">
@@ -184,6 +184,7 @@
 		props: [],
 		data() {
 			return {
+        excludeFields: [],
 				visible: false,
 				loading: false,
 				isDetail: false,
@@ -320,7 +321,9 @@
 		mounted() {},
 		methods: {
 			popupSelectChange2(a, b){
+        var excludeFields = [];
 				for (let i = 0; i < this.dataForm.saleback_item0List.length; i++) {
+          excludeFields.push(this.dataForm.saleback_item0List[i].licenseNo);
 					if(a == this.dataForm.saleback_item0List[i].licenseNum){
 						this.dataForm.saleback_item0List[i].materialName = b.material_name;
 						this.dataForm.saleback_item0List[i].settlement = b.settlement;
@@ -333,9 +336,12 @@
 						this.dataForm.saleback_item0List[i].pountType = b.pound_type;
 					}
 				}
+        this.excludeFields = excludeFields;
 			},
 			popupSelectChange(e,d){
 				this.dataForm.currency = d.currency;
+        this.excludeFields = [];
+        this.dataForm.saleback_item0List = [];
 			},
 			saleback_item0Exist() {
 				let isOk = true;

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

@@ -6,7 +6,7 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="单据编号">
-                                        <el-input v-model="query.documentNo" placeholder="请输入" clearable>  </el-input>
+              <el-input v-model="query.documentNo" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -22,9 +22,9 @@
           <div>
             <el-button type="primary" 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>
           </div>
           <div class="JNPF-common-head-right">
@@ -35,44 +35,46 @@
             <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="salesOrderId" label="销售订单" width="0" align="left"
-/>
-                            <el-table-column prop="jg_salesorder.contractName" label="合同名称" width="0" align="left"
-/>
-                            <el-table-column prop="jg_salesorder.costomerName" label="客户名称" width="0" align="left"
-/>
-                            <el-table-column prop="refundAmount" label="退款金额" width="0" align="left"
-/>
-                            <el-table-column prop="actualAmount" 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="单据编号" width="200" align="center" sortablefixed="left"
+          />
+          <el-table-column prop="salesOrderId" label="销售订单" width="200" align="center"sortable fixed="left"
+          />
+          <el-table-column prop="jg_salesorder.contractName" label="合同名称" width="120"sortable align="center"
+          />
+          <el-table-column prop="jg_salesorder.costomerName" label="客户名称" width="200" sortable align="center"
+          />
+          <el-table-column prop="refundAmount" label="退款金额" width="120" align="center" sortable
+          />
+          <el-table-column prop="actualAmount" label="实退金额" width="120" align="center" sortable
+          />
+          <el-table-column label="币别" width="120" prop="currency" algin="center" sortable
+          >
             <template slot-scope="scope">
               {{ scope.row.currency | dynamicText(currencyOptions) }}
             </template>
           </el-table-column>
-                            <el-table-column prop="refundNum" label="退货数量" width="0" align="left"
-/>
-                                <el-table-column label="单据状态 " width="0" prop="status" algin="left"
->
+          <el-table-column prop="refundNum" label="退货数量" width="120" align="center" sortable
+          />
+          <el-table-column label="单据状态 " width="120" prop="status" algin="center" sortable
+          >
             <template slot-scope="scope">
               {{ scope.row.status | dynamicText(statusOptions) }}
             </template>
           </el-table-column>
-                            <el-table-column prop="creatorTime" label="创建时间" width="0" align="left"
-/>
-                            <el-table-column prop="creatorUserName" label="创建人" width="0" align="left"
-/>
-                            <el-table-column prop="remark" label="备注" width="0" align="left"
-/>
+          <el-table-column prop="creatorTime" label="创建时间" width="120" align="center" sortable
+          />
+          <el-table-column prop="creatorUserName" label="创建人" width="120" align="center" sortable
+          />
+          <el-table-column prop="remark" label="备注" width="120" align="center"  sortable
+          />
           <el-table-column label="操作" fixed="right"
-width="150" >
+                           width="150">
             <template slot-scope="scope">
               <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
+                         @click="addOrUpdateHandle(scope.row.id)">编辑
               </el-button>
               <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
               </el-button>
@@ -82,7 +84,8 @@ width="150" >
             </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"/>
@@ -93,19 +96,19 @@ width="150" >
 
 <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',
@@ -118,29 +121,35 @@ width="150" >
         listQuery: {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
+          sort: 'desc',
+          sidx: ''
         },
         formVisible: false,
         exportBoxVisible: false,
         columnList: [
-                    {prop: 'documentNo', label: '单据编号'},
-                    {prop: 'salesOrderId', label: '销售订单'},
-                    {prop: 'jg_salesorder.contractName', label: '合同名称'},
-                    {prop: 'jg_salesorder.costomerName', label: '客户名称'},
-                    {prop: 'refundAmount', label: '退款金额'},
-                    {prop: 'actualAmount', label: '实退金额'},
-                    {prop: 'currency', label: '币别'},
-                    {prop: 'refundNum', label: '退货数量'},
-                    {prop: 'status', label: '单据状态 '},
-                    {prop: 'creatorTime', label: '创建时间'},
-                    {prop: 'creatorUserName', label: '创建人'},
-                    {prop: 'remark', label: '备注'},
+          { prop: 'documentNo', label: '单据编号' },
+          { prop: 'salesOrderId', label: '销售订单' },
+          { prop: 'jg_salesorder.contractName', label: '合同名称' },
+          { prop: 'jg_salesorder.costomerName', label: '客户名称' },
+          { prop: 'refundAmount', label: '退款金额' },
+          { prop: 'actualAmount', label: '实退金额' },
+          { prop: 'currency', label: '币别' },
+          { prop: 'refundNum', label: '退货数量' },
+          { prop: 'status', label: '单据状态 ' },
+          { prop: 'creatorTime', label: '创建时间' },
+          { prop: 'creatorUserName', label: '创建人' },
+          { prop: 'remark', label: '备注' }
         ],
-                                currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
-                            currencyProps:{"label":"fullName","value":"id"},
-                                statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],
-                            statusProps:{"label":"fullName","value":"id"},
+        currencyOptions: [{ 'fullName': '人民币', 'id': '0' }, { 'fullName': '美元', 'id': '1' }, {
+          'fullName': '英镑',
+          'id': '2'
+        }],
+        currencyProps: { 'label': 'fullName', 'value': 'id' },
+        statusOptions: [{ 'fullName': '已保存', 'id': '0' }, { 'fullName': '审批中', 'id': '1' }, {
+          'fullName': '已审批',
+          'id': '2'
+        }],
+        statusProps: { 'label': 'fullName', 'value': 'id' }
       }
     },
     computed: {
@@ -152,32 +161,34 @@ 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()
       },
       initData() {
-                this.listLoading = true;
+        this.listLoading = true
         let _query = {
           ...this.listQuery,
           ...this.query,
-                    menuId:this.menuId
-                };
+          menuId: this.menuId
+        }
         request({
           url: `/api/saleback/Saleback/getList`,
           method: 'post',
           data: _query
         }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
+          var _list = []
+          for (let i = 0; i < res.data.list.length; i++) {
+            res.data.list[i].creatorTime = res.data.list[i].creatorTime ? res.data.list[i].creatorTime.substring(0,
+              10) : '';
+            let _data = res.data.list[i]
             _list.push(_data)
           }
           this.list = _list
@@ -200,10 +211,10 @@ width="150" >
               onClose: () => {
                 this.initData()
               }
-                        });
+            })
           })
         }).catch(() => {
-                });
+        })
       },
       handleSelectionChange(val) {
         const res = val.map(item => item.id)
@@ -214,7 +225,7 @@ width="150" >
           this.$message({
             type: 'error',
             message: '请选择一条数据',
-                            duration: 1500,
+            duration: 1500
           })
           return
         }
@@ -232,7 +243,7 @@ width="150" >
               onClose: () => {
                 this.initData()
               }
-                            });
+            })
           })
         }).catch(() => {
         })
@@ -250,7 +261,7 @@ 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/saleback/Saleback/Actions/Export`,
           method: 'GET',
@@ -266,8 +277,8 @@ width="150" >
         this.listQuery = {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "",
+          sort: 'desc',
+          sidx: ''
         }
         this.initData()
       },

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

@@ -6,28 +6,28 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="供应商编码">
-                                        <el-input v-model="query.supplierCode" placeholder="请输入" clearable>  </el-input>
+              <el-input v-model="query.supplierCode" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="供应商名称">
-                                        <el-input v-model="query.supplierName" placeholder="请输入" clearable>  </el-input>
+              <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-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-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-input v-model="query.supplierSiteCode" placeholder="请输入" clearable></el-input>
               </el-form-item>
             </el-col>
           </template>
@@ -50,9 +50,11 @@
           <div>
             <el-button type="primary" 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-download" @click="">导入
+            </el-button>
+            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -63,91 +65,94 @@
             <screenfull isContainer/>
           </div>
         </div>
-                <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="companyId" label="所属公司" width="0" align="left"
- sortable="custom" />
-                            <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 label="供应商等级" width="0" prop="supplierLevel" algin="left"
- sortable="custom" >
+        <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="supplierCode" label="供应商编码" width="200" align="center"  fixed="left" sortable
+                           sortable="custom"/>
+          <el-table-column prop="companyId" label="所属公司" width="200" align="center"  fixed="left" sortable
+                           sortable="custom"/>
+          <el-table-column prop="supplierName" label="供应商名称" width="200" align="center" sortable
+                           sortable="custom"/>
+          <el-table-column prop="country" label="国家" width="120" align="center" sortable
+          />
+          <el-table-column prop="supply" label="供货指标" width="120" align="center" sortable
+          />
+          <el-table-column prop="province" label="省" width="120" align="center" sortable
+          />
+          <el-table-column prop="contactName" label="联系人" width="120" align="center" sortable
+                           sortable="custom"/>
+          <el-table-column label="供应商等级" width="120" prop="supplierLevel" algin="center" sortable
+                           sortable="custom">
             <template slot-scope="scope">
               {{ 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"
->
+          <el-table-column prop="contactPhone" label="联系电话" width="200" align="center" sortable
+                           sortable="custom"/>
+          <el-table-column label="供应商性质" width="120" prop="enterprise" algin="center" sortable
+          >
             <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 label="供应商类型" width="0" prop="classification" algin="left"
->
+          <el-table-column prop="address" label="地址" width="200" align="center" sortable
+                           sortable="custom"/>
+          <el-table-column label="供应商类型" width="120" prop="classification" algin="center" sortable
+          >
             <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"
->
+          <el-table-column prop="bank" label="开户行" width="200" align="center" sortable
+          />
+          <el-table-column prop="vatRegistrationNum" label="纳税编号" width="200" align="center" sortable
+          />
+          <el-table-column prop="bankAccount" label="银行账户" width="200" align="center" sortable
+          />
+          <el-table-column label="默认税码" width="120" prop="taxCode" algin="center" sortable
+          >
             <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"
->
+          <el-table-column prop="payable" label="应付科目" width="120" align="center" sortable
+          />
+          <el-table-column label="是否采购" width="120" prop="isPurchase" algin="center" sortable
+          >
             <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"
->
+          <el-table-column prop="prepaid" label="预付科目" width="120" align="center" sortable
+          />
+          <el-table-column label="是否付款" width="120" prop="isPayment" algin="center" sortable
+          >
             <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" >
+          <el-table-column label="是否启用" width="120" prop="status" algin="center" sortable
+                           sortable="custom">
             <template slot-scope="scope">
               {{ scope.row.status | dynamicText(statusOptions) }}
             </template>
           </el-table-column>
-                            <el-table-column prop="supplierSiteCode" label="供应商地点" width="0" align="left"
- sortable="custom" />
+          <el-table-column prop="supplierSiteCode" label="供应商地点" width="120" align="center" sortable
+                           sortable="custom"/>
           <el-table-column label="操作" fixed="right"
-                                         width="100" >
+                           width="100">
             <template slot-scope="scope">
               <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
+                         @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"/>
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+                    @pagination="initData"/>
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
@@ -158,24 +163,24 @@
 
 <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 {
         showAll: false,
         detailVisible: false,
         query: {
-                                supplierCode:undefined,
-                                supplierName:undefined,
-                                contactName:undefined,
-                                contactPhone:undefined,
-                                supplierSiteCode:undefined,
+          supplierCode: undefined,
+          supplierName: undefined,
+          contactName: undefined,
+          contactPhone: undefined,
+          supplierSiteCode: undefined
         },
         treeProps: {
           children: 'children',
@@ -188,49 +193,55 @@
         listQuery: {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
+          sort: 'desc',
+          sidx: 'creatorTime'
         },
         formVisible: false,
         exportBoxVisible: false,
         columnList: [
-                    {prop: 'supplierCode', label: '供应商编码'},
-                    {prop: 'companyId', label: '所属公司'},
-                    {prop: 'supplierName', label: '供应商名称'},
-                    {prop: 'country', label: '国家'},
-                    {prop: 'supply', label: '供货指标'},
-                    {prop: 'province', label: '省'},
-                    {prop: 'contactName', label: '联系人'},
-                    {prop: 'supplierLevel', label: '供应商等级'},
-                    {prop: 'contactPhone', label: '联系电话'},
-                    {prop: 'enterprise', label: '供应商性质'},
-                    {prop: 'address', 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: '供应商地点'},
+          { prop: 'supplierCode', label: '供应商编码' },
+          { prop: 'companyId', label: '所属公司' },
+          { prop: 'supplierName', label: '供应商名称' },
+          { prop: 'country', label: '国家' },
+          { prop: 'supply', label: '供货指标' },
+          { prop: 'province', label: '省' },
+          { prop: 'contactName', label: '联系人' },
+          { prop: 'supplierLevel', label: '供应商等级' },
+          { prop: 'contactPhone', label: '联系电话' },
+          { prop: 'enterprise', label: '供应商性质' },
+          { prop: 'address', 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"},
+        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: {
@@ -242,32 +253,32 @@
       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()
       },
       initData() {
-                this.listLoading = true;
+        this.listLoading = true
         let _query = {
           ...this.listQuery,
           ...this.query,
-                    menuId:this.menuId
-                };
+          menuId: this.menuId
+        }
         request({
           url: `/api/example/Supplier/getList`,
           method: 'post',
           data: _query
         }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
+          var _list = []
+          for (let i = 0; i < res.data.list.length; i++) {
+            let _data = res.data.list[i]
             _list.push(_data)
           }
           this.list = _list
@@ -290,10 +301,10 @@
               onClose: () => {
                 this.initData()
               }
-                        });
+            })
           })
         }).catch(() => {
-                });
+        })
       },
       handleSelectionChange(val) {
         const res = val.map(item => item.id)
@@ -304,7 +315,7 @@
           this.$message({
             type: 'error',
             message: '请选择一条数据',
-                            duration: 1500,
+            duration: 1500
           })
           return
         }
@@ -322,7 +333,7 @@
               onClose: () => {
                 this.initData()
               }
-                            });
+            })
           })
         }).catch(() => {
         })
@@ -340,7 +351,7 @@
         })
       },
       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/example/Supplier/Actions/Export`,
           method: 'GET',
@@ -356,8 +367,8 @@
         this.listQuery = {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
+          sort: 'desc',
+          sidx: 'creatorTime'
         }
         this.initData()
       },

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

@@ -2,77 +2,62 @@
 <el-dialog title="详情"
            :close-on-click-modal="false" append-to-body
            :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="800px">
+           width="1000px">
 <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="12" >
-                <el-form-item  label="物料编码"  
- prop="materialCode" >
-                        <p>{{dataForm.materialCode}}</p>
+            <el-col :span="24" >
+                <el-form-item  label="磅单上传"  
+ prop="poundPictures" >
+                    <JNPF-UploadFz    v-model="dataForm.poundPictures"
+ disabled
+ detailed  :fileSize="500"  sizeUnit="MB"  :limit="9"  buttonText="点击上传"  >
+                </JNPF-UploadFz>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
                 <el-form-item  label="物料名称"  
- prop="materialName" >
-                        <p>{{dataForm.materialName}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="销售合同"  
- prop="salesName" >
-                        <p>{{dataForm.salesName}}</p>
+ prop="materialId" >
+                        <p>{{dataForm.materialId}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
                 <el-form-item  label="客户名称"  
- prop="customerName" >
-                        <p>{{dataForm.customerName}}</p>
+ prop="customerId" >
+                        <p>{{dataForm.customerId}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="是否垫资"  
- prop="advance" >
-                         <p>{{ dataForm.advance | dynamicText(advanceOptions) }} </p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="销售价格"  
- prop="salesPrice" >
-                        <p>{{dataForm.salesPrice}}</p>
+                <el-form-item  label="销售合同"  
+ prop="salesId" >
+                        <p>{{dataForm.salesId}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="运输方式"  
- prop="transportType" >
-                         <p>{{ dataForm.transportType | dynamicText(transportTypeOptions) }} </p>
+                <el-form-item  label="车牌号"  
+ prop="vehicleId" >
+                        <p>{{dataForm.vehicleId}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="12" >
-                <el-form-item  label="运费"  
- prop="departmentId" >
-                        <p>{{dataForm.departmentId}}</p>
+            <el-col :span="24" >
+                <el-form-item  label="车辆图片"  
+ prop="vehiclePictures" >
+                    <JNPF-UploadImg    v-model="dataForm.vehiclePictures"
+ disabled
+ detailed  :fileSize="500"  sizeUnit="MB"  :limit="9"  >
+                </JNPF-UploadImg>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="车号"  
- prop="licenseNo" >
-                        <p>{{dataForm.licenseNo}}</p>
+                <el-form-item  label="磅单时间"  
+ prop="poundDate" >
+                        <p>{{jnpf.dateFormat(dataForm.poundDate)}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
-                <el-form-item  label="业务员名称"  
- prop="businessName" >
-                        <p>{{dataForm.businessName}}</p>
-                </el-form-item>
-            </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="磅单图片"  
- prop="poundPictures" >
-                    <JNPF-UploadImg    v-model="dataForm.poundPictures"
- disabled
- detailed  :fileSize="500"  sizeUnit="MB"  :limit="9"  >
-                </JNPF-UploadImg>
+                <el-form-item  label="磅单号"  
+ prop="poundlistNo" >
+                        <p>{{dataForm.poundlistNo}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
@@ -99,31 +84,58 @@
                         <p>{{dataForm.netWeight}}</p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="备注"  
- prop="remark" >
-                        <p>{{dataForm.remark}}</p>
+            <el-col :span="12" >
+                <el-form-item  label="单位 "  
+ prop="unit" >
+                         <p>{{ dataForm.unit | dynamicText(unitOptions) }} </p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="司机名称"  
- prop="driverName" >
-                        <p>{{dataForm.driverName}}</p>
+            <el-col :span="12" >
+                <el-form-item  label="运输类型"  
+ prop="transportType" >
+                         <p>{{ dataForm.transportType | dynamicText(transportTypeOptions) }} </p>
                 </el-form-item>
             </el-col>
-            <el-col :span="24" >
-                <el-form-item  label="车辆图片"  
- prop="vehiclePictures" >
-                    <JNPF-UploadImg    v-model="dataForm.vehiclePictures"
- disabled
- detailed  :fileSize="500"  sizeUnit="MB"  :limit="9"  >
-                </JNPF-UploadImg>
+            <el-col :span="12" >
+                <el-form-item  label="是否垫资"  
+ prop="advance" >
+                         <p>{{ dataForm.advance | dynamicText(advanceOptions) }} </p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="运费"  
+ prop="transportPrice" >
+                        <p>{{dataForm.transportPrice}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="销售价格"  
+ prop="salesPrice" >
+                        <p>{{dataForm.salesPrice}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="业务员"  
+ prop="creatorUserName" >
+                        <p>{{dataForm.creatorUserName}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="自然人"  
+ prop="naturalId" >
+                        <p>{{dataForm.naturalId}}</p>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <el-form-item  label="备注"  
+ prop="remark" >
+                        <p>{{dataForm.remark}}</p>
                 </el-form-item>
             </el-col>
             <el-col :span="24" >
-                <el-form-item  label="制单人"  
- prop="creatorusername" >
-                        <p>{{dataForm.creatorusername}}</p>
+                <el-form-item  label="磅单日期"  
+ prop="creatorTime" >
+                        <p>{{dataForm.creatorTime}}</p>
                 </el-form-item>
             </el-col>
     </template>
@@ -149,28 +161,31 @@
                 printId: '',
             dataForm: {
                 id :'',
-                            materialCode : "",
-                            materialName : '',
-                            salesName : "",
-                            customerName : '',
-                            advance : "",
-                            salesPrice : '',
-                            transportType : "",
-                            departmentId : 11.225,
-                            licenseNo : "",
-                            businessName : '',
                             poundPictures : [],
-                            tareWeight : '',
-                            grossWeight : '',
-                            buckleWeight : '',
-                            netWeight : '',
-                            remark : '',
-                            driverName : '',
+                            materialId : "",
+                            customerId : "",
+                            salesId : "",
+                            vehicleId : "",
                             vehiclePictures : [],
-                            creatorusername : '',
+                            poundDate : '',
+                            poundlistNo : '',
+                            tareWeight : 0,
+                            grossWeight : 0,
+                            buckleWeight : 0,
+                            netWeight : 0,
+                            unit : "0",
+                            transportType : "0",
+                            advance : "0",
+                            transportPrice : 0,
+                            salesPrice : '',
+                            creatorUserName : "",
+                            naturalId : "",
+                            remark : '',
+                            creatorTime : "",
             },
-                                advanceOptions:[{"fullName":"是","id":"1"},{"fullName":"否","id":"0"}],
+                                unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
                                 transportTypeOptions:[{"fullName":"汽运","id":"0"},{"fullName":"船运","id":"1"},{"fullName":"火车","id":"2"}],
+                                advanceOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
 
         }
         },

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

@@ -1,171 +1,217 @@
 <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">
-		<el-row :gutter="15" class="">
-			<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px"
-				label-position="right">
+<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">
+<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="12" >
-            <el-form-item  label="物料编码"
-                           prop="materialCode" >
-              <popupSelect    v-model="dataForm.materialCode"
-                              placeholder="请选择"  clearable  field="materialCode" interfaceId="381037852907038533"  :columnOptions="materialCodecolumnOptions" propsValue="item_code" relationField="item_code" popupType="dialog"
-                              popupTitle="选择数据"  popupWidth="800px">
+            <el-col :span="24" >
+                <el-form-item  label="磅单上传"
+ prop="poundPictures" >
+                    <JNPF-UploadImg    v-model="dataForm.poundPictures"
+ :fileSize="500"    sizeUnit="MB"  :limit="9"  buttonText="点击上传" >
 
-              </popupSelect>
+                </JNPF-UploadImg>
                 </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%"}'>
+ prop="materialId" >
+                    <popupSelect    v-model="dataForm.materialId"
+ placeholder="请选择物料编码"  clearable  field="materialId" interfaceId="381037852907038533" :columnOptions="materialIdcolumnOptions" propsValue="id" relationField="description" popupType="dialog"
+ popupTitle="选择数据"  popupWidth="800px"
+ hasPage :pageSize="20"   >
 
-                          </el-input>
+                </popupSelect>
                 </el-form-item>
             </el-col>
-<!--          <el-col :span="12" >
-            <el-form-item  label="物料名称"
-            >
-              <popupAttr
-                relationField="materialCode"  showField="description" >
-                v-model="dataForm.materialCode"
-              </popupAttr>
-            </el-form-item>
-          </el-col>-->
-					<el-col :span="12">
-						<el-form-item label="销售合同" prop="salesName">
-							<popupSelect v-model="dataForm.salesName" placeholder="请选择" clearable field="salesName"
-              interfaceId="381038993740949317" :columnOptions="salesNamecolumnOptions" propsValue="contract_name" relationField="contract_name" popupType="dialog"
-              popupTitle="选择数据"  popupWidth="800px">
+            <el-col :span="12" >
+                <el-form-item  label="客户名称"
+ prop="customerId" >
+                    <popupSelect    v-model="dataForm.customerId"
+ placeholder="请选择客户"  clearable  field="customerId" interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
+ popupTitle="选择数据"  popupWidth="800px"
+ hasPage :pageSize="20"   >
+
                 </popupSelect>
                 </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-col :span="12" >
+                <el-form-item  label="销售合同"
+ prop="salesId" >
+                    <popupSelect    v-model="dataForm.salesId"
+ placeholder="请选择合同"  clearable  field="salesId" interfaceId="381037852907038533" :columnOptions="salesIdcolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
+ popupTitle="选择数据"  popupWidth="800px"
+ hasPage :pageSize="20"   >
 
-							</el-input>
+                </popupSelect>
                 </el-form-item>
             </el-col>
-					<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-col :span="12" >
+                <el-form-item  label="车牌号"
+ prop="vehicleId" >
+                    <popupSelect    v-model="dataForm.vehicleId"
+ placeholder="请选择车辆"  clearable  field="vehicleId" interfaceId="381432451370615173" :columnOptions="vehicleIdcolumnOptions" propsValue="id" relationField="ticketno" popupType="dialog"
+ popupTitle="选择数据"  popupWidth="800px"
+ hasPage :pageSize="20"   >
 
-							</el-select>
+                </popupSelect>
                 </el-form-item>
             </el-col>
-					<el-col :span="12">
-						<el-form-item label="销售价格" prop="salesPrice">
-							<el-input-number v-model="dataForm.salesPrice" placeholder="数字文本" :step="1">
+            <el-col :span="24" >
+                <el-form-item  label="车辆图片"
+ prop="vehiclePictures" >
+                    <JNPF-UploadImg    v-model="dataForm.vehiclePictures"
+ :fileSize="500"    sizeUnit="MB"  :limit="9" >
 
-							</el-input-number>
+                </JNPF-UploadImg>
                 </el-form-item>
             </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-col :span="12" >
+                <el-form-item  label="磅单时间"
+ prop="poundDate" >
+                    <el-date-picker    v-model="dataForm.poundDate"
+ placeholder="请选择"  clearable  :style='{"width":"100%"}' type="date"  format="yyyy-MM-dd"  value-format="timestamp" >
 
-							</el-select>
+                </el-date-picker>
                 </el-form-item>
             </el-col>
-					<el-col :span="12">
-						<el-form-item label="运费" prop="departmentId">
-							<el-input-number v-model="dataForm.departmentId" placeholder="数字文本" :step="1">
+            <el-col :span="12" >
+                <el-form-item  label="磅单号"
+ prop="poundlistNo" >
+                    <el-input    v-model="dataForm.poundlistNo"
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
 
-							</el-input-number>
+                </el-input>
                 </el-form-item>
             </el-col>
-					<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">
+            <el-col :span="12" >
+                <el-form-item  label="皮重"
+ prop="tareWeight" >
+                    <el-input    v-model="dataForm.tareWeight"
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
 
-							</popupSelect>
+                </el-input>
                 </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-col :span="12" >
+                <el-form-item  label="毛重"
+ prop="grossWeight" >
+                    <el-input    v-model="dataForm.grossWeight"
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
 
                 </el-input>
                 </el-form-item>
             </el-col>
-					<el-col :span="24">
-						<el-form-item label="磅单图片" prop="poundPictures">
-							<JNPF-UploadImg v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="9">
+            <el-col :span="12" >
+                <el-form-item  label="扣重"
+ prop="buckleWeight" >
+                    <el-input    v-model="dataForm.buckleWeight"
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
 
-							</JNPF-UploadImg>
+                </el-input>
                 </el-form-item>
             </el-col>
-					<el-col :span="12">
-						<el-form-item label="皮重" prop="tareWeight">
-							<el-input-number v-model="dataForm.tareWeight" placeholder="数字文本" :step="1">
+            <el-col :span="12" >
+                <el-form-item  label="净重"
+ prop="netWeight" >
+                    <el-input    v-model="dataForm.netWeight"
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
 
-							</el-input-number>
+                </el-input>
                 </el-form-item>
             </el-col>
-					<el-col :span="12">
-						<el-form-item label="毛重" prop="grossWeight">
-							<el-input-number v-model="dataForm.grossWeight" placeholder="数字文本" :step="1">
+            <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-input-number>
+                </el-select>
                 </el-form-item>
             </el-col>
-					<el-col :span="12">
-						<el-form-item label="扣重" prop="buckleWeight">
-							<el-input-number v-model="dataForm.buckleWeight" placeholder="数字文本" :step="1">
+            <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-input-number>
+                </el-select>
                 </el-form-item>
             </el-col>
-					<el-col :span="12">
-						<el-form-item label="净重" prop="netWeight">
-							<el-input-number v-model="dataForm.netWeight" placeholder="数字文本" :step="1">
+            <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-input-number>
+                </el-select>
                 </el-form-item>
             </el-col>
-					<el-col :span="24">
-						<el-form-item label="备注" prop="remark">
-							<el-input v-model="dataForm.remark" placeholder="请输入" clearable :style='{"width":"100%"}'>
+            <el-col :span="12" >
+                <el-form-item  label="运费"
+ prop="transportPrice" >
+                    <el-input    v-model="dataForm.transportPrice"
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
 
                 </el-input>
                 </el-form-item>
             </el-col>
-					<el-col :span="24">
-						<el-form-item label="司机名称" prop="driverName">
-							<el-input v-model="dataForm.driverName" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+            <el-col :span="12" >
+                <el-form-item  label="销售价格"
+ prop="salesPrice" >
+                    <el-input    v-model="dataForm.salesPrice"
+ placeholder="请输入"  clearable  :style='{"width":"100%"}'>
 
                 </el-input>
                 </el-form-item>
             </el-col>
-					<el-col :span="24">
-						<el-form-item label="车辆图片" prop="vehiclePictures">
-							<JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
+            <el-col :span="12" >
+                <el-form-item  label="业务员"
+ prop="creatorUserName" >
+                    <popupSelect    v-model="dataForm.creatorUserName"
+ placeholder="请选择业务员"  clearable  field="creatorUserName" interfaceId="ebcc44be142e43b795c0d769abd6d25a" :columnOptions="creatorUserNamecolumnOptions" propsValue="F_RealName" relationField="F_RealName" popupType="dialog"
+ popupTitle="选择数据"  popupWidth="800px"
+ hasPage :pageSize="20"   >
 
-							</JNPF-UploadImg>
+                </popupSelect>
                 </el-form-item>
             </el-col>
-					<el-col :span="24">
-						<el-form-item label="制单人" prop="creatorusername">
-							<el-input v-model="dataForm.creatorusername" placeholder="请输入" clearable
-								:style='{"width":"100%"}'>
+            <el-col :span="12" >
+                <el-form-item  label="自然人"
+ prop="naturalId" >
+                    <popupSelect    v-model="dataForm.naturalId"
+ placeholder="请选择自然人"  clearable  field="naturalId" interfaceId="395933800510599301" :columnOptions="naturalIdcolumnOptions" propsValue="id" relationField="name" popupType="dialog"
+ popupTitle="选择数据"  popupWidth="800px"
+ hasPage :pageSize="20"   >
+
+                </popupSelect>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+                <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="24" >
+                <el-form-item  label="磅单日期"
+ prop="creatorTime" >
+                    <el-input    v-model="dataForm.creatorTime"
+ placeholder="系统自动生成"  readonly >
 
                 </el-input>
                 </el-form-item>
             </el-col>
     </template>
-			</el-form>
+</el-form>
     </el-row>
     <span slot="footer" class="dialog-footer">
         <el-button @click="visible = false"> 取 消</el-button>
@@ -175,12 +221,8 @@
 </template>
 <script>
     import request from '@/utils/request'
-	import {
-		getDataInterfaceRes
-	} from '@/api/systemData/dataInterface'
-	import {
-		getDictionaryDataSelector
-	} from '@/api/systemData/dictionary'
+    import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
+    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     export default {
         components: {},
         props: [],
@@ -190,141 +232,148 @@
                 loading: false,
                 isDetail: false,
             dataForm: {
-					materialCode: "",
-					materialName: '',
-					salesName: "",
-					customerName: '',
-					advance: "",
-					salesPrice: '',
-					transportType: "",
-					departmentId: 11.225,
-					licenseNo: "",
-					businessName: '',
-					poundPictures: [],
-					tareWeight: '',
-					grossWeight: '',
-					buckleWeight: '',
-					netWeight: '',
-					remark: '',
-					driverName: '',
-					vehiclePictures: [],
-					creatorusername: '',
+                            poundPictures : [],
+                            materialId : "",
+                            customerId : "",
+                            salesId : "",
+                            vehicleId : "",
+                            vehiclePictures : [],
+                            poundDate : '',
+                            poundlistNo : '',
+                            tareWeight : 0,
+                            grossWeight : 0,
+                            buckleWeight : 0,
+                            netWeight : 0,
+                            unit : "0",
+                            transportType : "0",
+                            advance : "0",
+                            transportPrice : 0,
+                            salesPrice : '',
+                            creatorUserName : "",
+                            naturalId : "",
+                            remark : '',
+                            creatorTime : "",
             },
-				rules: {
-					materialCode: [{
+            rules:
+            {
+                            poundPictures: [
+                                {
                                     required: true,
-						message: '请选择',
-						trigger: 'change'
-					}, ],
-					salesName: [{
+                                    message: '请至少选择一个',
+                                    trigger: 'click'
+                                },
+                        ],
+                            materialId: [
+                                {
                                     required: true,
-						message: '请选择',
+                                    message: '请选择物料编码',
                                     trigger: 'change'
-					}, ],
-					licenseNo: [{
+                                },
+                        ],
+                            customerId: [
+                                {
                                     required: true,
-						message: '请选择',
+                                    message: '请选择客户',
                                     trigger: 'change'
-					}, ],
-					// poundPictures: [
-					//     {
-					//         required: true,
-					//         message: '请至少选择一个',
-					//         trigger: 'click'
-					//     },
-					// ],
-					tareWeight: [{
-						required: true,
-						message: '数字文本',
-						trigger: ["blur", "change"]
-					}, ],
-					grossWeight: [{
-						required: true,
-						message: '数字文本',
-						trigger: ["blur", "change"]
-					}, ],
-					buckleWeight: [{
+                                },
+                        ],
+                            salesId: [
+                                {
                                     required: true,
-						message: '数字文本',
-						trigger: ["blur", "change"]
-					}, ],
-					netWeight: [{
+                                    message: '请选择合同',
+                                    trigger: 'change'
+                                },
+                        ],
+                            vehicleId: [
+                                {
                                     required: true,
-						message: '数字文本',
-						trigger: ["blur", "change"]
-					}, ],
+                                    message: '请选择车辆',
+                                    trigger: 'change'
                                 },
-        materialCodecolumnOptions:[ {"label":"物料编码","value":"item_code"},
-          {"label":"物料名称","value":"description"},
-          {"label":"库存组织","value":"organization_id"},
-          {"label":"默认库区","value":"areaname"},],
-				salesNamecolumnOptions: [{
-					"label": "合同编码",
-					"value": "contract_code"
+                        ],
+                            vehiclePictures: [
+                                {
+                                    required: true,
+                                    message: '请至少选择一个',
+                                    trigger: 'click'
                                 },
+                        ],
+                            poundDate: [
                                 {
-            "label": "合同名称",
-            "value": "contract_name"
+                                    required: true,
+                                    message: '请选择',
+                                    trigger: 'change'
                                 },
+                        ],
+                            poundlistNo: [
                                 {
-            "label": "合同类型",
-            "value": "contract_type"
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
                                 },
+                        ],
+                            tareWeight: [
                                 {
-            "label": "供应商/客户名称",
-            "value": "name"
-          },],
-				advanceOptions: [{
-					"fullName": "是",
-					"id": "1"
-				}, {
-					"fullName": "否",
-					"id": "0"
-				}],
-				transportTypeOptions: [{
-					"fullName": "汽运",
-					"id": "0"
-				}, {
-					"fullName": "船运",
-					"id": "1"
-				}, {
-					"fullName": "火车",
-					"id": "2"
-				}],
-				licenseNocolumnOptions: [{
-					"label": "车牌号",
-					"value": "ticketno"
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
                                 },
+                        ],
+                            grossWeight: [
                                 {
-            "label": "司机",
-            "value": "drivername"
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
                                 },
+                        ],
+                            buckleWeight: [
                                 {
-            "label": "车辆照片",
-            "value": "vehiclephotos"
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
                                 },
+                        ],
+                            netWeight: [
                                 {
-            "label": "手机号",
-            "value": "contact"
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
                                 },
+                        ],
+                            salesPrice: [
                                 {
-            "label": "创建人",
-            "value": "f_creatorusername"
+                                    required: true,
+                                    message: '请输入',
+                                    trigger: 'blur'
                                 },
+                        ],
+                            creatorUserName: [
                                 {
-            "label": "创建时间",
-            "value": "f_creatortime"
-          },],
-
+                                    required: true,
+                                    message: '请选择业务员',
+                                    trigger: 'change'
+                                },
+                        ],
+            },
+                    materialIdcolumnOptions:[ {"label":"物料编码","value":"item_code"}, {"label":"物料名称","value":"description"}, {"label":"默认库区","value":"areaname"}, {"label":"库存组织","value":"organization_id"},],
+                    customerIdcolumnOptions:[ {"label":"客户编码","value":"supplier_cd"}, {"label":"客户名称","value":"supplier_nm"}, {"label":"地址","value":"address"}, {"label":"银行账号","value":"bank_account"},],
+                    salesIdcolumnOptions:[ {"label":"合同编码","value":"contract_code"}, {"label":"合同名称","value":"contract_name"}, {"label":"合同类型","value":"contract_type"}, {"label":"供应商/客户名称","value":"name"},],
+                    vehicleIdcolumnOptions:[ {"label":"车牌号","value":"ticketno"}, {"label":"司机","value":"drivername"}, {"label":"车辆照片","value":"vehiclephotos"}, {"label":"手机号","value":"contact"},],
+                        unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
+                        transportTypeOptions:[{"fullName":"汽运","id":"0"},{"fullName":"船运","id":"1"},{"fullName":"火车","id":"2"}],
+                        advanceOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
+                    creatorUserNamecolumnOptions:[ {"label":"人员名称","value":"F_RealName"}, {"label":"人员职位","value":"F_FullName"},],
+                    naturalIdcolumnOptions:[ {"label":"自然人名称","value":"name"}, {"label":"自然人手机号","value":"contact"}, {"label":"自然人地址","value":"adress"},],
 
         }
         },
         computed: {},
         watch: {},
-		created() {},
+        created() {
+        },
         mounted() {},
         methods: {
-			clearData(data) {
+            clearData(data){
                 for (let key in data) {
                     if (data[key] instanceof Array) {
                         data[key] = [];
@@ -341,16 +390,16 @@
                 this.isDetail = isDetail || false;
                 this.$nextTick(() => {
                     this.$refs['elForm'].resetFields();
-					if (this.dataForm.id) {
+                    if(this.dataForm.id){
                         this.loading = true
                         request({
-							url: '/api/tradeupload/Tradeupload/' + this.dataForm.id,
+                            url: '/api/tradeupload/Tradeupload/'+this.dataForm.id,
                             method: 'get'
                         }).then(res => {
                             this.dataInfo(res.data)
                             this.loading = false
                         });
-					} else {
+                    }else{
                        this.clearData(this.dataForm)
                     }
                 });
@@ -365,7 +414,7 @@
                 })
             },
             request() {
-				var _data = this.dataList()
+                var _data =this.dataList()
                 if (!this.dataForm.id) {
                     request({
                         url: '/api/tradeupload/Tradeupload',
@@ -382,9 +431,9 @@
                             }
                         })
                     })
-				} else {
+                }else{
                     request({
-						url: '/api/tradeupload/Tradeupload/' + this.dataForm.id,
+                        url: '/api/tradeupload/Tradeupload/'+this.dataForm.id,
                         method: 'PUT',
                         data: _data
                     }).then((res) => {
@@ -400,18 +449,19 @@
                     })
                 }
             },
-			dataList() {
+            dataList(){
                 var _data = JSON.parse(JSON.stringify(this.dataForm));
                         _data.poundPictures = JSON.stringify(_data.poundPictures)
                         _data.vehiclePictures = JSON.stringify(_data.vehiclePictures)
                 return _data;
             },
-			dataInfo(dataAll) {
-				let _dataAll = dataAll
-				_dataAll.poundPictures = JSON.parse(_dataAll.poundPictures)
-				_dataAll.vehiclePictures = JSON.parse(_dataAll.vehiclePictures)
+            dataInfo(dataAll){
+                let _dataAll =dataAll
+                        _dataAll.poundPictures = JSON.parse( _dataAll.poundPictures)
+                        _dataAll.vehiclePictures = JSON.parse( _dataAll.vehiclePictures)
                 this.dataForm = _dataAll
             },
         },
     }
+
 </script>

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

@@ -5,8 +5,16 @@
             <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 label="磅单时间">
+                                        <el-date-picker v-model="query.poundDate" type="daterange"
+                                                        value-format="timestamp" format="yyyy-MM-dd" start-placeholder="开始日期"
+                                                        end-placeholder="结束日期" >
+                                        </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                        <el-col :span="6">
+                                <el-form-item label="磅单号">
+                                        <el-input v-model="query.poundlistNo" placeholder="请输入" clearable>  </el-input>
                                 </el-form-item>
                             </el-col>
                     <el-col :span="6">
@@ -20,120 +28,99 @@
             <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 type="primary" 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>
                     </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()" />
+                                     @click="reset()"/>
                         </el-tooltip>
-						<screenfull isContainer />
+                        <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" >
+                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
+                            <el-table-column prop="creatorTime" label="磅单日期" width="0" align="left"
+/>
+                            <el-table-column prop="vehicleId" label="车牌号" width="0" align="left"
+/>
+                            <el-table-column prop="materialId" label="物料名称" width="0" align="left"
+/>
+                            <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="customerId" label="客户名称" width="0" align="left"
+/>
+                            <el-table-column prop="salesId" label="销售合同" width="0" align="left"
+/>
+                                <el-table-column label="是否垫资" width="0" prop="advance" algin="left"
+>
                                     <template slot-scope="scope">
                                         {{ scope.row.advance | dynamicText(advanceOptions) }}
                                     </template>
                                 </el-table-column>
-          <el-table-column prop="transportType" label="运输方式" sortable width="100" align="center" >
+                                <el-table-column label="运输类型" width="0" prop="transportType" algin="left"
+>
                                     <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">
+                            <el-table-column prop="transportPrice" label="运费" width="0" align="left"
+/>
+                            <el-table-column prop="salesPrice" label="销售价格" width="0" align="left"
+/>
+                            <el-table-column prop="creatorUserName" label="业务员" width="0" align="left"
+/>
+                            <el-table-column prop="remark" label="备注" width="0" align="left"
+/>
+                        <el-table-column label="操作" fixed="right"
+width="150" >
                             <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>
                             </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: {
-					materialName: undefined,
+                                poundDate:undefined,
+                                poundlistNo:undefined,
                 },
                 treeProps: {
                     children: 'children',
@@ -142,8 +129,7 @@
                 },
                 list: [],
                 listLoading: true,
-				multipleSelection: [],
-				total: 0,
+ multipleSelection: [],                    total: 0,
                 listQuery: {
                         currentPage: 1,
                         pageSize: 20,
@@ -152,96 +138,29 @@
                 },
                 formVisible: false,
                 exportBoxVisible: false,
-				columnList: [{
-						prop: 'licenseNo',
-						label: '车号'
-					},
-					{
-						prop: 'materialName',
-						label: '物料名称'
-					},
-					{
-						prop: 'grossWeight',
-						label: '毛重'
-					},
-					{
-						prop: 'tareWeight',
-						label: '皮重'
-					},
-					{
-						prop: 'buckleWeight',
-						label: '扣重'
-					},
-					{
-						prop: 'netWeight',
-						label: '净重'
-					},
-					{
-						prop: 'driverName',
-						label: '司机名称'
-					},
-					{
-						prop: 'customerName',
-						label: '客户名称'
-					},
-					{
-						prop: 'salesName',
-						label: '销售合同'
-					},
-					{
-						prop: 'advance',
-						label: '是否垫资'
-					},
-					{
-						prop: 'transportType',
-						label: '运输方式'
-					},
-					{
-						prop: 'departmentId',
-						label: '运费'
-					},
-					{
-						prop: 'salesPrice',
-						label: '销售价格'
-					},
-					{
-						prop: 'creatorusername',
-						label: '制单人'
-					},
-					{
-						prop: 'businessName',
-						label: '业务员名称'
-					},
-					{
-						prop: 'remark',
-						label: '备注'
-					},
+                columnList: [
+                    {prop: 'creatorTime', label: '磅单日期'},
+                    {prop: 'vehicleId', label: '车牌号'},
+                    {prop: 'materialId', label: '物料名称'},
+                    {prop: 'grossWeight', label: '毛重'},
+                    {prop: 'tareWeight', label: '皮重'},
+                    {prop: 'buckleWeight', label: '扣重'},
+                    {prop: 'netWeight', label: '净重'},
+                    {prop: 'customerId', label: '客户名称'},
+                    {prop: 'salesId', label: '销售合同'},
+                    {prop: 'advance', label: '是否垫资'},
+                    {prop: 'transportType', label: '运输类型'},
+                    {prop: 'transportPrice', label: '运费'},
+                    {prop: 'salesPrice', label: '销售价格'},
+                    {prop: 'creatorUserName', label: '业务员'},
+                    {prop: 'remark', label: '备注'},
                 ],
-				advanceOptions: [{
-					"fullName": "是",
-					"id": "1"
-				}, {
-					"fullName": "否",
-					"id": "0"
-				}],
-				advanceProps: {
-					"label": "fullName",
-					"value": "id"
-				},
-				transportTypeOptions: [{
-					"fullName": "汽运",
-					"id": "0"
-				}, {
-					"fullName": "船运",
-					"id": "1"
-				}, {
-					"fullName": "火车",
-					"id": "2"
-				}],
-				transportTypeProps: {
-					"label": "fullName",
-					"value": "id"
-				},
+                                unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
+                            unitProps:{"label":"fullName","value":"id"},
+                                transportTypeOptions:[{"fullName":"汽运","id":"0"},{"fullName":"船运","id":"1"},{"fullName":"火车","id":"2"}],
+                            transportTypeProps:{"label":"fullName","value":"id"},
+                                advanceOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
+                            advanceProps:{"label":"fullName","value":"id"},
             }
         },
         computed: {
@@ -253,17 +172,13 @@
                 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()
@@ -273,15 +188,15 @@
                 let _query = {
                     ...this.listQuery,
                     ...this.query,
-					menuId: this.menuId
+                    menuId:this.menuId
                 };
                 request({
                     url: `/api/tradeupload/Tradeupload/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)
                     }
@@ -307,7 +222,8 @@
                             }
                         });
                     })
-				}).catch(() => {});
+                }).catch(() => {
+                });
             },
                 handleSelectionChange(val) {
                     const res = val.map(item => item.id)
@@ -338,7 +254,8 @@
                                 }
                             });
                         })
-				}).catch(() => {})
+                    }).catch(() => {
+                    })
                 },
             addOrUpdateHandle(id, isDetail) {
                 this.formVisible = true
@@ -353,12 +270,7 @@
                 })
             },
             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/tradeupload/Tradeupload/Actions/Export`,
                     method: 'GET',

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

@@ -1,85 +1,91 @@
 <template>
-<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'"
+  <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="800px">
-<el-row :gutter="15" class="">
-<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
+             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="24" >
+          <el-col :span="24">
             <el-form-item label="仓库编码"
- prop="code" >
+                          prop="code">
               <el-input v-model="dataForm.code"
                         placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="24" >
+          <el-col :span="24">
             <el-form-item label="仓库名称"
- prop="name" >
+                          prop="name">
               <el-input v-model="dataForm.name"
                         placeholder="请输入仓库名称" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="24" >
+          <el-col :span="24">
             <el-form-item label="公司"
- prop="companyCode" >
+                          prop="companyCode">
               <popupSelect v-model="dataForm.companyCode"
- placeholder="请选择公司"  clearable  field="companyCode" interfaceId="394016341591396805" :columnOptions="companyCodecolumnOptions" propsValue="F_Id" relationField="F_FullName" popupType="dialog"
+                           placeholder="请选择公司" clearable field="companyCode" interfaceId="394016341591396805"
+                           :columnOptions="companyCodecolumnOptions" propsValue="F_Id" relationField="F_FullName"
+                           popupType="dialog"
                            popupTitle="选择数据" popupWidth="800px"
               >
 
               </popupSelect>
             </el-form-item>
           </el-col>
-            <el-col :span="24" >
+          <el-col :span="24">
             <el-form-item label="仓库位置"
- prop="location" >
+                          prop="location">
               <el-input v-model="dataForm.location"
                         placeholder="请输入仓库位置" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="24" >
+          <el-col :span="24">
             <el-form-item label="仓库类型"
- prop="type" >
+                          prop="type">
               <el-select v-model="dataForm.type"
                          placeholder="请选择仓库类型" clearable :style='{"width":"100%"}'>
-                            <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+                <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.fullName" :value="item.id"
+                           :disabled="item.disabled"></el-option>
 
               </el-select>
             </el-form-item>
           </el-col>
-            <el-col :span="24" >
+          <el-col :span="24">
             <el-form-item label="ERP子库"
- prop="sublibrary" >
+                          prop="sublibrary">
               <popupSelect v-model="dataForm.sublibrary"
- placeholder="请选择子库"  clearable  field="sublibrary" interfaceId="394818245032483845" :columnOptions="sublibrarycolumnOptions" propsValue="id" relationField="inventory_org_detail_name" popupType="dialog"
+                           placeholder="请选择子库" clearable field="sublibrary" interfaceId="394818245032483845"
+                           :columnOptions="sublibrarycolumnOptions" propsValue="id"
+                           relationField="inventory_org_detail_name" popupType="dialog"
                            popupTitle="选择数据" popupWidth="800px"
               >
 
               </popupSelect>
             </el-form-item>
           </el-col>
-            <el-col :span="24" >
+          <el-col :span="24">
             <el-form-item label="激活状态 "
- prop="activestate" >
+                          prop="activestate">
               <el-radio-group v-model="dataForm.activestate"
- size="small" >
-                            <el-radio v-for="(item, index) in activestateOptions" :key="index" :label="item.id" :disabled="item.disabled" >
+                              size="small">
+                <el-radio v-for="(item, index) in activestateOptions" :key="index" :label="item.id"
+                          :disabled="item.disabled">
                   {{item.fullName}}
                 </el-radio>
 
               </el-radio-group>
             </el-form-item>
           </el-col>
-            <el-col :span="24" >
+          <el-col :span="24">
             <el-form-item label="备注"
- prop="remark" >
+                          prop="remark">
               <el-input v-model="dataForm.remark"
                         placeholder="请输入备注" clearable :style='{"width":"100%"}'>
 
@@ -87,7 +93,7 @@
             </el-form-item>
           </el-col>
         </template>
-</el-form>
+      </el-form>
     </el-row>
     <span slot="footer" class="dialog-footer">
         <el-button @click="visible = false"> 取 消</el-button>
@@ -99,6 +105,7 @@
   import request from '@/utils/request'
   import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
   import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+
   export default {
     components: {},
     props: [],
@@ -108,28 +115,72 @@
         loading: false,
         isDetail: false,
         dataForm: {
-                            code : '',
-                            name : '',
-                            companyCode : "",
-                            location : '',
-                            type : "",
-                            sublibrary : "",
-                            activestate : "2",
-                            remark : '',
-                            creatorUserName : "",
-                            creatorTime : "",
-                            lastModifyUserName : "",
-                            lastModifyTime : "",
-                            orgId : "",
-                            departmentId : "",
+          code: '',
+          name: '',
+          companyCode: '',
+          location: '',
+          type: '',
+          sublibrary: '',
+          activestate: '2',
+          remark: '',
+          creatorUserName: '',
+          creatorTime: '',
+          lastModifyUserName: '',
+          lastModifyTime: '',
+          orgId: '',
+          departmentId: ''
         },
         rules:
           {
+            code: [
+              {
+                required: true,
+                message: '请输入仓库编码',
+                trigger: 'change'
+              }
+            ],
+            name: [
+              {
+                required: true,
+                message: '请选择公司名称',
+                trigger: 'change'
+              }
+            ],
+            type: [
+              {
+                required: true,
+                message: '请输入库房类型',
+                trigger: 'change'
+              }
+            ],
+            sublibrary: [
+              {
+                required: true,
+                message: '请输入ERP库存组织',
+                trigger: 'change'
+              }
+            ],
+
           },
-                    companyCodecolumnOptions:[ {"label":"公司名称","value":"F_FullName"}, {"label":"公司编码","value":"F_EnCode"},],
-                        typeOptions:[{"fullName":"原料库","id":"0"},{"fullName":"中间库","id":"1"},{"fullName":"成品库","id":"2"},{"fullName":"副产品库","id":"3"},{"fullName":"废次品库","id":"4"},{"fullName":"备件辅材库","id":"5"},{"fullName":"贸易虚拟库","id":"6"},{"fullName":"仓储库","id":"7"},{"fullName":"能源库","id":"8"},{"fullName":"其他库","id":"9"},{"fullName":"帐外库","id":"10"}],
-                    sublibrarycolumnOptions:[ {"label":"编码","value":"inventory_org_detail_code"}, {"label":"库存组织详细名称","value":"inventory_org_detail_name"}, {"label":"库存组织名称","value":"inventory_org_name"},],
-                        activestateOptions:[{"fullName":"激活","id":"1"},{"fullName":"未激活","id":"0"}],
+        companyCodecolumnOptions: [{ 'label': '公司名称', 'value': 'F_FullName' }, {
+          'label': '公司编码',
+          'value': 'F_EnCode'
+        }],
+        typeOptions: [{ 'fullName': '原料库', 'id': '0' }, { 'fullName': '中间库', 'id': '1' }, {
+          'fullName': '成品库',
+          'id': '2'
+        }, { 'fullName': '副产品库', 'id': '3' }, { 'fullName': '废次品库', 'id': '4' }, {
+          'fullName': '备件辅材库',
+          'id': '5'
+        }, { 'fullName': '贸易虚拟库', 'id': '6' }, { 'fullName': '仓储库', 'id': '7' }, {
+          'fullName': '能源库',
+          'id': '8'
+        }, { 'fullName': '其他库', 'id': '9' }, { 'fullName': '帐外库', 'id': '10' }],
+        sublibrarycolumnOptions: [{ 'label': '编码', 'value': 'inventory_org_detail_code' }, {
+          'label': '库存组织详细名称',
+          'value': 'inventory_org_detail_name'
+        }, { 'label': '库存组织名称', 'value': 'inventory_org_name' }],
+        activestateOptions: [{ 'fullName': '激活', 'id': '1' }, { 'fullName': '未激活', 'id': '0' }]
 
       }
     },
@@ -137,38 +188,39 @@
     watch: {},
     created() {
     },
-        mounted() {},
+    mounted() {
+    },
     methods: {
-            clearData(data){
+      clearData(data) {
         for (let key in data) {
           if (data[key] instanceof Array) {
-                        data[key] = [];
+            data[key] = []
           } else if (data[key] instanceof Object) {
-                        this.clearData(data[key]);
+            this.clearData(data[key])
           } else {
-                        data[key] = "";
+            data[key] = ''
           }
         }
       },
       init(id, isDetail) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
+        this.dataForm.id = id || 0
+        this.visible = true
+        this.isDetail = isDetail || false
         this.$nextTick(() => {
-                    this.$refs['elForm'].resetFields();
-                    if(this.dataForm.id){
+          this.$refs['elForm'].resetFields()
+          if (this.dataForm.id) {
             this.loading = true
             request({
-                            url: '/api/example/WareHouse/'+this.dataForm.id,
+              url: '/api/example/WareHouse/' + this.dataForm.id,
               method: 'get'
             }).then(res => {
               this.dataInfo(res.data)
               this.loading = false
-                        });
-                    }else{
+            })
+          } else {
             this.clearData(this.dataForm)
           }
-                });
+        })
         this.$store.commit('generator/UPDATE_RELATION_DATA', {})
       },
       // 表单提交
@@ -180,7 +232,7 @@
         })
       },
       request() {
-                var _data =this.dataList()
+        var _data = this.dataList()
         if (!this.dataForm.id) {
           request({
             url: '/api/example/WareHouse',
@@ -197,9 +249,9 @@
               }
             })
           })
-                }else{
+        } else {
           request({
-                        url: '/api/example/WareHouse/'+this.dataForm.id,
+            url: '/api/example/WareHouse/' + this.dataForm.id,
             method: 'PUT',
             data: _data
           }).then((res) => {
@@ -215,15 +267,15 @@
           })
         }
       },
-            dataList(){
-                var _data = JSON.parse(JSON.stringify(this.dataForm));
-                return _data;
+      dataList() {
+        var _data = JSON.parse(JSON.stringify(this.dataForm))
+        return _data
       },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
+      dataInfo(dataAll) {
+        let _dataAll = dataAll
         this.dataForm = _dataAll
-            },
-        },
+      }
+    }
   }
 
 </script>

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

@@ -6,12 +6,12 @@
         <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="仓库编码">
-                                        <el-input v-model="query.code" placeholder="请输入" clearable>  </el-input>
+              <el-input v-model="query.code" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="仓库名称">
-                                        <el-input v-model="query.name" placeholder="请输入" clearable>  </el-input>
+              <el-input v-model="query.name" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -27,9 +27,11 @@
           <div>
             <el-button type="primary" 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-download" @click="">导入
+            </el-button>
+            <el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()">批量删除
             </el-button>
           </div>
           <div class="JNPF-common-head-right">
@@ -40,43 +42,46 @@
             <screenfull isContainer/>
           </div>
         </div>
-                <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'  has-c @selection-change="handleSelectionChange">
-                            <el-table-column prop="code" label="仓库编码" width="0" align="left"
-/>
-                            <el-table-column prop="name" label="仓库名称" width="0" align="left"
-/>
-                            <el-table-column prop="companyCode" label="公司" width="0" align="left"
-/>
-                            <el-table-column prop="location" label="仓库位置" width="0" align="left"
-/>
-                                <el-table-column label="仓库类型" width="0" prop="type" 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="code" label="仓库编码" width="200" align="center" sortable
+          />
+          <el-table-column prop="name" label="仓库名称" width="200" align="center" sortable
+          />
+          <el-table-column prop="companyCode" label="公司" width="200" align="center" sortable
+          />
+          <el-table-column prop="location" label="仓库位置" width="200" align="center" sortable
+          />
+          <el-table-column label="仓库类型" width="120" prop="type" algin="center" sortable
+          >
             <template slot-scope="scope">
               {{ scope.row.type | dynamicText(typeOptions) }}
             </template>
           </el-table-column>
-                            <el-table-column prop="sublibrary" label="ERP子库" width="0" align="left"
-/>
-                                <el-table-column label="激活状态 " width="0" prop="activestate" algin="left"
->
+          <el-table-column prop="sublibrary" label="ERP子库" width="200" align="center" sortable
+          />
+          <el-table-column label="激活状态 " width="120" prop="activestate" algin="center" sortable
+          >
             <template slot-scope="scope">
               {{ scope.row.activestate | dynamicText(activestateOptions) }}
             </template>
           </el-table-column>
-                            <el-table-column prop="remark" label="备注" width="0" align="left"
-/>
+          <el-table-column prop="remark" label="备注" width="0" align="center" sortable
+          />
           <el-table-column label="操作" fixed="right"
-                                         width="100" >
+                           width="100">
             <template slot-scope="scope">
               <el-button type="text"
-                                                   @click="addOrUpdateHandle(scope.row.id)" >编辑
+                         @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"/>
+        <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
+                    @pagination="initData"/>
       </div>
     </div>
     <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
@@ -87,20 +92,20 @@
 
 <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: {
-                                code:undefined,
-                                name:undefined,
+          code: undefined,
+          name: undefined
         },
         treeProps: {
           children: 'children',
@@ -113,25 +118,34 @@
         listQuery: {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
+          sort: 'desc',
+          sidx: 'creatorTime'
         },
         formVisible: false,
         exportBoxVisible: false,
         columnList: [
-                    {prop: 'code', label: '仓库编码'},
-                    {prop: 'name', label: '仓库名称'},
-                    {prop: 'companyCode', label: '公司'},
-                    {prop: 'location', label: '仓库位置'},
-                    {prop: 'type', label: '仓库类型'},
-                    {prop: 'sublibrary', label: 'ERP子库'},
-                    {prop: 'activestate', label: '激活状态 '},
-                    {prop: 'remark', label: '备注'},
+          { prop: 'code', label: '仓库编码' },
+          { prop: 'name', label: '仓库名称' },
+          { prop: 'companyCode', label: '公司' },
+          { prop: 'location', label: '仓库位置' },
+          { prop: 'type', label: '仓库类型' },
+          { prop: 'sublibrary', label: 'ERP子库' },
+          { prop: 'activestate', label: '激活状态 ' },
+          { prop: 'remark', label: '备注' }
         ],
-                                typeOptions:[{"fullName":"原料库","id":"0"},{"fullName":"中间库","id":"1"},{"fullName":"成品库","id":"2"},{"fullName":"副产品库","id":"3"},{"fullName":"废次品库","id":"4"},{"fullName":"备件辅材库","id":"5"},{"fullName":"贸易虚拟库","id":"6"},{"fullName":"仓储库","id":"7"},{"fullName":"能源库","id":"8"},{"fullName":"其他库","id":"9"},{"fullName":"帐外库","id":"10"}],
-                            typeProps:{"label":"fullName","value":"id"},
-                                activestateOptions:[{"fullName":"激活","id":"1"},{"fullName":"未激活","id":"0"}],
-                            activestateProps:{"label":"fullName","value":"id"},
+        typeOptions: [{ 'fullName': '原料库', 'id': '0' }, { 'fullName': '中间库', 'id': '1' }, {
+          'fullName': '成品库',
+          'id': '2'
+        }, { 'fullName': '副产品库', 'id': '3' }, { 'fullName': '废次品库', 'id': '4' }, {
+          'fullName': '备件辅材库',
+          'id': '5'
+        }, { 'fullName': '贸易虚拟库', 'id': '6' }, { 'fullName': '仓储库', 'id': '7' }, {
+          'fullName': '能源库',
+          'id': '8'
+        }, { 'fullName': '其他库', 'id': '9' }, { 'fullName': '帐外库', 'id': '10' }],
+        typeProps: { 'label': 'fullName', 'value': 'id' },
+        activestateOptions: [{ 'fullName': '激活', 'id': '1' }, { 'fullName': '未激活', 'id': '0' }],
+        activestateProps: { 'label': 'fullName', 'value': 'id' }
       }
     },
     computed: {
@@ -143,32 +157,32 @@
       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()
       },
       initData() {
-                this.listLoading = true;
+        this.listLoading = true
         let _query = {
           ...this.listQuery,
           ...this.query,
-                    menuId:this.menuId
-                };
+          menuId: this.menuId
+        }
         request({
           url: `/api/example/WareHouse/getList`,
           method: 'post',
           data: _query
         }).then(res => {
-                    var _list =[];
-                    for(let i=0;i<res.data.list.length;i++){
-                        let _data = res.data.list[i];
+          var _list = []
+          for (let i = 0; i < res.data.list.length; i++) {
+            let _data = res.data.list[i]
             _list.push(_data)
           }
           this.list = _list
@@ -191,10 +205,10 @@
               onClose: () => {
                 this.initData()
               }
-                        });
+            })
           })
         }).catch(() => {
-                });
+        })
       },
       handleSelectionChange(val) {
         const res = val.map(item => item.id)
@@ -205,7 +219,7 @@
           this.$message({
             type: 'error',
             message: '请选择一条数据',
-                            duration: 1500,
+            duration: 1500
           })
           return
         }
@@ -223,7 +237,7 @@
               onClose: () => {
                 this.initData()
               }
-                            });
+            })
           })
         }).catch(() => {
         })
@@ -241,7 +255,7 @@
         })
       },
       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/example/WareHouse/Actions/Export`,
           method: 'GET',
@@ -257,8 +271,8 @@
         this.listQuery = {
           currentPage: 1,
           pageSize: 20,
-                    sort: "desc",
-                    sidx: "creatorTime",
+          sort: 'desc',
+          sidx: 'creatorTime'
         }
         this.initData()
       },