4月16问题修改

jg-waiwang-pro
胡川虎 6 months ago
parent 4733944778
commit adbac15d70

@ -709,4 +709,18 @@
LEFT JOIN jg_contract c ON a.contract_id = c.id AND c.f_delete_mark is NULL
${ew.customSqlSegment}
</select>
<select id="queryCurrentDayNum" resultType="java.math.BigDecimal">
SELECT IFNULL(SUM( business_num ),0) businessNum from jg_business_order_product_relational where business_order_id in (SELECT a.id from jg_business_order a
LEFT JOIN flow_task b on a.id = b.f_process_id
where business_type = #{businessOrderEntity.businessType} and b.f_status = 2 and
DATE(a.f_last_modify_time) = #{businessOrderEntity.searchDateString}) AND product_id = #{businessOrderEntity.productId}
</select>
<select id="queryCurrentDayNum2" resultType="java.math.BigDecimal">
SELECT IFNULL(SUM( business_num ),0) businessNum from jg_business_order_product_relational where business_order_id in (SELECT a.id from jg_business_order a
LEFT JOIN flow_task b on a.id = b.f_process_id
where business_type = #{businessOrderEntity.businessType} and b.f_status = 2 and
date_format(a.f_last_modify_time,'%Y-%m') = #{businessOrderEntity.searchDateString}) AND product_id = #{businessOrderEntity.productId}
</select>
</mapper>

@ -17,4 +17,16 @@
</select>
<select id="queryCurrentDayNum" resultType="java.math.BigDecimal">
SELECT IFNULL(SUM( outbound_number ),0) businessNum from jg_warehousing_outbound_product where warehousing_outbound_id in (SELECT a.id from jg_warehousing_outbound a
LEFT JOIN flow_task b on a.id = b.f_process_id
where a.warehousing_outbound_type = #{warehousingOutboundEntity.warehousingOutboundType} and (b.f_status = 2 or b.f_status is null) and
DATE(a.f_last_modify_time) = #{warehousingOutboundEntity.searchDateString}) AND product_id = #{warehousingOutboundEntity.productId}
</select>
<select id="queryCurrentDayNum2" resultType="java.math.BigDecimal">
SELECT IFNULL(SUM( outbound_number ),0) businessNum from jg_warehousing_outbound_product where warehousing_outbound_id in (SELECT a.id from jg_warehousing_outbound a
LEFT JOIN flow_task b on a.id = b.f_process_id
where a.warehousing_outbound_type = #{warehousingOutboundEntity.warehousingOutboundType} and (b.f_status = 2 or b.f_status is null) and
date_format(a.f_last_modify_time,'%Y-%m') = #{warehousingOutboundEntity.searchDateString}) AND product_id = #{warehousingOutboundEntity.productId}
</select>
</mapper>

@ -71,4 +71,18 @@
</foreach>
</if>
</select>
<select id="queryCurrentDayNum" resultType="java.math.BigDecimal">
SELECT IFNULL(SUM( storage_number ),0) businessNum from jg_warehousing_storage_product where warehousing_storage_id in (SELECT a.id from jg_warehousing_storage a
LEFT JOIN flow_task b on a.id = b.f_process_id
where a.warehousing_storage_type = #{warehousingStorage.warehousingStorageType} and (b.f_status = 2 or b.f_status is null) and
DATE(a.f_last_modify_time) = #{warehousingStorage.searchDateString}) AND product_id = #{warehousingStorage.productId}
</select>
<select id="queryCurrentDayNum2" resultType="java.math.BigDecimal">
SELECT IFNULL(SUM( storage_number ),0) businessNum from jg_warehousing_storage_product where warehousing_storage_id in (SELECT a.id from jg_warehousing_storage a
LEFT JOIN flow_task b on a.id = b.f_process_id
where a.warehousing_storage_type = #{warehousingStorage.warehousingStorageType} and (b.f_status = 2 or b.f_status is null) and
date_format(a.f_last_modify_time,'%Y-%m') = #{warehousingStorage.searchDateString}) AND product_id = #{warehousingStorage.productId}
</select>
</mapper>

@ -7,21 +7,18 @@ import jnpf.base.UserInfo;
import jnpf.base.entity.DataInterfaceEntity;
import jnpf.base.service.DataInterfaceService;
import jnpf.base.service.DbLinkService;
import jnpf.entity.InventoryEntity;
import jnpf.entity.InventorySnapshotEntity;
import jnpf.entity.ProductPriceEntity;
import jnpf.entity.*;
import jnpf.scheduletask.entity.TimeTaskEntity;
import jnpf.scheduletask.model.ContentNewModel;
import jnpf.scheduletask.model.TaskParameterModel;
import jnpf.service.InventoryService;
import jnpf.service.InventorySnapshotService;
import jnpf.service.ProductPriceService;
import jnpf.service.*;
import jnpf.util.JsonUtil;
import jnpf.util.StringUtil;
import jnpf.util.data.DataSourceContextHolder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@ -41,6 +38,12 @@ public class MyJobHandler {
private InventoryService inventoryService;
@Autowired
private InventorySnapshotService inventorySnapshotService;
@Autowired
private BusinessOrderService businessOrderService;
@Autowired
private WarehousingStorageService warehousingStorageService;
@Autowired
private WarehousingOutboundService warehousingOutboundService;
/**
* (1)
*
@ -74,6 +77,7 @@ public class MyJobHandler {
// 获取参数
String param = XxlJobHelper.getJobParam();
Date dateNow = new Date();
String dateNowString = sdf.format(dateNow); //格式化今天
//获取前一天的年月日
Date dateBefore = new Date();
Calendar calendar = Calendar.getInstance(); //得到日历
@ -106,12 +110,36 @@ public class MyJobHandler {
inventorySnapshotEntity.setInventoryNumberStart(inventorySnapshotEntityList.get(0).getInventoryNumberEnd());//期初
}
inventorySnapshotEntity.setInventoryNumberEnd(inventoryEntity.getInventoryNumber());//期末
//inventorySnapshotEntity.setPurchaseNumber();//采购数量
//inventorySnapshotEntity.setPurchaseWarehousingNumber();//'采购入库数量'
//inventorySnapshotEntity.setSaleNumber();//'销售数量'
//inventorySnapshotEntity.setSaleOutboundNumber();//'销售出库数量'
//inventorySnapshotEntity.setAlloteWarehousingNumber();//'调拨入库数量'
//inventorySnapshotEntity.setAlloteOutboundNumber();//'调拨出库数量'
//查询当天审批通过的采购订单数量,当前日期,采购订单
BusinessOrderEntity businessOrderEntity = new BusinessOrderEntity();
businessOrderEntity.setBusinessType("1");
businessOrderEntity.setSearchDateString(dateNowString);
businessOrderEntity.setProductId(inventoryEntity.getProductId());
BigDecimal purchaseNumber = businessOrderService.queryCurrentDayNum(businessOrderEntity);
inventorySnapshotEntity.setPurchaseNumber(purchaseNumber);//采购数量
businessOrderEntity.setBusinessType("2");
BigDecimal saleNumber = businessOrderService.queryCurrentDayNum(businessOrderEntity);
inventorySnapshotEntity.setSaleNumber(saleNumber);//'销售数量'
//查询当天审批通过的采购入库数量
WarehousingStorageEntity warehousingStorage = new WarehousingStorageEntity();
warehousingStorage.setSearchDateString(dateNowString);
warehousingStorage.setWarehousingStorageType("1");//采购入库
warehousingStorage.setProductId(inventoryEntity.getProductId());
BigDecimal purchaseWarehousingNumber = warehousingStorageService.queryCurrentDayNum(warehousingStorage);
inventorySnapshotEntity.setPurchaseWarehousingNumber(purchaseWarehousingNumber);//'采购入库数量'
//查询当天审批通过的销售出库数量
WarehousingOutboundEntity warehousingOutboundEntity = new WarehousingOutboundEntity();
warehousingOutboundEntity.setSearchDateString(dateNowString);
warehousingOutboundEntity.setWarehousingOutboundType("1");//销售出库
warehousingOutboundEntity.setProductId(inventoryEntity.getProductId());
BigDecimal saleOutboundNumber = warehousingOutboundService.queryCurrentDayNum(warehousingOutboundEntity);
inventorySnapshotEntity.setSaleOutboundNumber(saleOutboundNumber);//'销售出库数量'
warehousingStorage.setWarehousingStorageType("2");//调拨入库
BigDecimal alloteWarehousingNumber = warehousingStorageService.queryCurrentDayNum(warehousingStorage);
inventorySnapshotEntity.setAlloteWarehousingNumber(alloteWarehousingNumber);//'调拨入库数量'
warehousingOutboundEntity.setWarehousingOutboundType("2");//调拨出库
BigDecimal alloteOutboundNumber = warehousingOutboundService.queryCurrentDayNum(warehousingOutboundEntity);
inventorySnapshotEntity.setAlloteOutboundNumber(alloteOutboundNumber);//'调拨出库数量'
//inventorySnapshotEntity.setOtherNumber();//''其他数量''
inventorySnapshotEntity.setInventoryUnitId(inventoryEntity.getInventoryUnitId());
inventorySnapshotEntity.setWarehouseId(inventoryEntity.getWarehouseId());
@ -133,9 +161,11 @@ public class MyJobHandler {
@XxlJob("inventorySnapshotMonthHandler")
public void inventorySnapshotMonthHandler() {
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); //设置时间格式
SimpleDateFormat sdf2=new SimpleDateFormat("yyyy-MM"); //设置时间格式
// 获取参数
String param = XxlJobHelper.getJobParam();
Date dateNow = new Date();
String dateNowString = sdf2.format(dateNow);
//获取前一天的年月日
Date dateBefore = new Date();
// 获取当前日期
@ -173,13 +203,41 @@ public class MyJobHandler {
inventorySnapshotEntity.setInventoryNumberStart(inventorySnapshotEntityList.get(0).getInventoryNumberEnd());//期初
}
inventorySnapshotEntity.setInventoryNumberEnd(inventoryEntity.getInventoryNumber());//期末
//inventorySnapshotEntity.setPurchaseNumber();//采购数量
//inventorySnapshotEntity.setPurchaseWarehousingNumber();//'采购入库数量'
//inventorySnapshotEntity.setSaleNumber();//'销售数量'
//inventorySnapshotEntity.setSaleOutboundNumber();//'销售出库数量'
//inventorySnapshotEntity.setAlloteWarehousingNumber();//'调拨入库数量'
//inventorySnapshotEntity.setAlloteOutboundNumber();//'调拨出库数量'
//查询当天审批通过的采购订单数量,当前日期,采购订单
BusinessOrderEntity businessOrderEntity = new BusinessOrderEntity();
businessOrderEntity.setBusinessType("1");
businessOrderEntity.setSearchDateString(dateNowString);
businessOrderEntity.setProductId(inventoryEntity.getProductId());
BigDecimal purchaseNumber = businessOrderService.queryCurrentDayNum(businessOrderEntity);
inventorySnapshotEntity.setPurchaseNumber(purchaseNumber);//采购数量
businessOrderEntity.setBusinessType("2");
BigDecimal saleNumber = businessOrderService.queryCurrentDayNum(businessOrderEntity);
inventorySnapshotEntity.setSaleNumber(saleNumber);//'销售数量'
//查询当天审批通过的采购入库数量
WarehousingStorageEntity warehousingStorage = new WarehousingStorageEntity();
warehousingStorage.setSearchDateString(dateNowString);
warehousingStorage.setWarehousingStorageType("1");//采购入库
warehousingStorage.setProductId(inventoryEntity.getProductId());
BigDecimal purchaseWarehousingNumber = warehousingStorageService.queryCurrentDayNum(warehousingStorage);
inventorySnapshotEntity.setPurchaseWarehousingNumber(purchaseWarehousingNumber);//'采购入库数量'
//查询当天审批通过的销售出库数量
WarehousingOutboundEntity warehousingOutboundEntity = new WarehousingOutboundEntity();
warehousingOutboundEntity.setSearchDateString(dateNowString);
warehousingOutboundEntity.setWarehousingOutboundType("1");//销售出库
warehousingOutboundEntity.setProductId(inventoryEntity.getProductId());
BigDecimal saleOutboundNumber = warehousingOutboundService.queryCurrentDayNum(warehousingOutboundEntity);
inventorySnapshotEntity.setSaleOutboundNumber(saleOutboundNumber);//'销售出库数量'
warehousingStorage.setWarehousingStorageType("2");//调拨入库
BigDecimal alloteWarehousingNumber = warehousingStorageService.queryCurrentDayNum(warehousingStorage);
inventorySnapshotEntity.setAlloteWarehousingNumber(alloteWarehousingNumber);//'调拨入库数量'
warehousingOutboundEntity.setWarehousingOutboundType("2");//调拨出库
BigDecimal alloteOutboundNumber = warehousingOutboundService.queryCurrentDayNum(warehousingOutboundEntity);
inventorySnapshotEntity.setAlloteOutboundNumber(alloteOutboundNumber);//'调拨出库数量'
//inventorySnapshotEntity.setOtherNumber();//''其他数量''
inventorySnapshotEntity.setInventoryUnitId(inventoryEntity.getInventoryUnitId());
inventorySnapshotEntity.setWarehouseId(inventoryEntity.getWarehouseId());
inventorySnapshotEntity.setStorageAreaId(inventoryEntity.getStorageAreaId());

@ -49,4 +49,8 @@ public interface BusinessOrderMapper extends BaseMapper<BusinessOrderEntity> {
List<BusinessOrderEntity> purchaseOrderByReceiptOrder(@Param("ew") QueryWrapper<BusinessOrderEntity> queryWrapper);
BigDecimal queryOccupyInventory(@Param("inventoryEntity") InventoryEntity entity);
BigDecimal queryCurrentDayNum(@Param("businessOrderEntity") BusinessOrderEntity businessOrderEntity);
BigDecimal queryCurrentDayNum2(@Param("businessOrderEntity") BusinessOrderEntity businessOrderEntity);
}

@ -3,6 +3,9 @@ package jnpf.mapper;
import jnpf.entity.WarehousingOutboundEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
/**
* warehousingOutbound
@ -19,4 +22,7 @@ public interface WarehousingOutboundMapper extends BaseMapper<WarehousingOutboun
//关联销售单号
String querySalesNo(String id);
BigDecimal queryCurrentDayNum(@Param("warehousingOutboundEntity") WarehousingOutboundEntity warehousingOutboundEntity);
BigDecimal queryCurrentDayNum2(@Param("warehousingOutboundEntity") WarehousingOutboundEntity warehousingOutboundEntity);
}

@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.model.warehousingstorage.WarehousingStoragePagination;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
/**
* warehousingStorage
* V3.5
@ -24,4 +26,8 @@ public interface WarehousingStorageMapper extends BaseMapper<WarehousingStorageE
String queryPurchaseNo(String id);
IPage<WarehousingStorageEntity> queryByKeyword(@Param("page") Page<WarehousingStorageEntity> page, @Param("warehousingStoragePagination") WarehousingStoragePagination warehousingStoragePagination, @Param("ew") QueryWrapper<WarehousingStorageEntity> warehousingStorageQueryWrapper);
BigDecimal queryCurrentDayNum(@Param("warehousingStorage") WarehousingStorageEntity warehousingStorage);
BigDecimal queryCurrentDayNum2(@Param("warehousingStorage") WarehousingStorageEntity warehousingStorage);
}

@ -72,4 +72,8 @@ public interface BusinessOrderService extends IService<BusinessOrderEntity> {
List<BusinessOrderEntity> purchaseOrderByReceiptOrderInfo(QueryWrapper<BusinessOrderEntity> queryWrapper);
BigDecimal queryOccupyInventory(InventoryEntity entity);
BigDecimal queryCurrentDayNum(BusinessOrderEntity businessOrderEntity);
BigDecimal queryCurrentDayNum2(BusinessOrderEntity businessOrderEntity);
}

@ -4,6 +4,8 @@ import jnpf.model.deliveryorder.DeliveryOrderForm;
import jnpf.model.receiptorder.ReceiptOrderForm;
import jnpf.model.warehousingoutbound.*;
import jnpf.entity.*;
import java.math.BigDecimal;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -54,4 +56,7 @@ public interface WarehousingOutboundService extends IService<WarehousingOutbound
//采购发货单生成出库单
void saveOrUpdateByPurchaseDelivery(DeliveryOrderForm deliveryOrderForm) throws Exception;
BigDecimal queryCurrentDayNum(WarehousingOutboundEntity warehousingOutboundEntity);
BigDecimal queryCurrentDayNum2(WarehousingOutboundEntity warehousingOutboundEntity);
}

@ -3,6 +3,8 @@ package jnpf.service;
import jnpf.model.receiptorder.ReceiptOrderForm;
import jnpf.model.warehousingstorage.*;
import jnpf.entity.*;
import java.math.BigDecimal;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
@ -54,4 +56,8 @@ public interface WarehousingStorageService extends IService<WarehousingStorageEn
List<WarehousingStorageEntity> getWarehousingstorageoutboundList(WarehousingStoragePagination warehousingStoragePagination);
List<CwaccountvoucherEntity> getWarehousingstorageoutboundPoundlist(WarehousingStoragePagination warehousingStoragePagination);
BigDecimal queryCurrentDayNum(WarehousingStorageEntity warehousingStorage);
BigDecimal queryCurrentDayNum2(WarehousingStorageEntity warehousingStorage);
}

@ -797,6 +797,16 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
return businessOrderMapper.queryOccupyInventory(entity);
}
@Override
public BigDecimal queryCurrentDayNum(BusinessOrderEntity businessOrderEntity) {
return businessOrderMapper.queryCurrentDayNum(businessOrderEntity);
}
@Override
public BigDecimal queryCurrentDayNum2(BusinessOrderEntity businessOrderEntity) {
return businessOrderMapper.queryCurrentDayNum2(businessOrderEntity);
}
@Override
public List<ProductByContractModel> queryProductByContractInfo(String id) {
return businessOrderMapper.queryProductByContract(id);

@ -636,9 +636,9 @@ public class SubjectbasicServiceImpl extends ServiceImpl<SubjectbasicMapper, Sub
if(StringUtil.isEmpty(form.getEnterpriseName())){
return "企业名称不能为空";
}*/
if(StringUtil.isEmpty(form.getWorkAddress())){
/*if(StringUtil.isEmpty(form.getWorkAddress()) && ObjectUtil.notEqual(form.getCalssify(), "3") && ObjectUtil.notEqual(form.getSubjectBasicType(), "2")){
return "单位地址不能为空";
}
}*/
if(StringUtil.equals(form.getSettlementMethod(), "2") && StringUtil.isEmpty(form.getAdvanceRatio())){
return "预付比例不能为空";
}

@ -738,4 +738,14 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
}
}
@Override
public BigDecimal queryCurrentDayNum(WarehousingOutboundEntity warehousingOutboundEntity) {
return warehousingOutboundMapper.queryCurrentDayNum(warehousingOutboundEntity);
}
@Override
public BigDecimal queryCurrentDayNum2(WarehousingOutboundEntity warehousingOutboundEntity) {
return warehousingOutboundMapper.queryCurrentDayNum2(warehousingOutboundEntity);
}
}

@ -979,4 +979,14 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
}
return cwaccountvoucherEntityList;
}
@Override
public BigDecimal queryCurrentDayNum(WarehousingStorageEntity warehousingStorage) {
return warehousingStorageMapper.queryCurrentDayNum(warehousingStorage);
}
@Override
public BigDecimal queryCurrentDayNum2(WarehousingStorageEntity warehousingStorage) {
return warehousingStorageMapper.queryCurrentDayNum2(warehousingStorage);
}
}

@ -194,4 +194,8 @@ public class BusinessOrderEntity {
private String settlementMethod1;
@TableField(exist = false)
private String addressName;
@TableField(exist = false)
private String searchDateString;
@TableField(exist = false)
private String productId;
}

@ -64,5 +64,8 @@ public class WarehousingOutboundEntity {
@TableField(exist = false) //销售单号
private String salesNo;
@TableField(exist = false)
private String searchDateString;
@TableField(exist = false)
private String productId;
}

@ -85,5 +85,8 @@ public class WarehousingStorageEntity {
private String warehousingStorageTypeName;
@TableField(exist = false) //仓库
private String warehouseName;
@TableField(exist = false)
private String searchDateString;
@TableField(exist = false)
private String productId;
}

@ -541,7 +541,7 @@ const printOptionApi = {
}).then((res) => {
});
};
document.title = "JNPF快速开发平台";
document.title = "智慧管家平台";
iframe.contentWindow.print();
document.title = oldTitle;
setTimeout(() => {

@ -712,11 +712,11 @@ export default {
},
textChange() {
this.activeData.option.defaultValue = ''
if (this.activeData.dataType == 'static') this.activeData.option.defaultValue = 'JNPF快速开发平台'
if (this.activeData.dataType == 'static') this.activeData.option.defaultValue = '智慧管家平台'
},
dataTypeChange() {
this.activeData.option.defaultValue = ''
if (this.activeData.dataType == 'static') this.activeData.option.defaultValue = 'JNPF快速开发平台'
if (this.activeData.dataType == 'static') this.activeData.option.defaultValue = '智慧管家平台'
this.activeData.propsApi = ''
this.activeData.propsName = ''
},

@ -568,7 +568,7 @@ export const basicComponents = [{
],
appDefaultValue: [
{
fullName: "JNPF快速开发",
fullName: "智慧管家平台",
moduleId: "",
linkType: '2',
urlAddress: 'https://www.jnpfsoft.com/',
@ -872,7 +872,7 @@ export const basicComponents = [{
option: {
styleType: 2,
defaultValue: "",
textDefaultValue: "JNPF快速开发平台",
textDefaultValue: "智慧管家平台",
textFontSize: 14,
textFontColor: '#fff',
textFontWeight: false,

@ -314,7 +314,7 @@ export default {
},
getDefaultValue(row) {
const jnpfKey = row.jnpfKey
if (jnpfKey == 'text') return "JNPF快速开发平台"
if (jnpfKey == 'text') return "智慧管家平台"
if (jnpfKey == 'image') return "https://app.cdn.jnpfsoft.com/image/3.2/banner1.png"
if (jnpfKey == 'video') return "https://cdn.jnpfsoft.com/2022/video/index_video.mp4"
if (jnpfKey == 'barChart' || jnpfKey == 'lineChart' || jnpfKey == 'pieChart') return chartData.baseBarData

@ -3,7 +3,7 @@ import i18n from '@/lang'
import { getLanguage } from '@/lang/index'
import store from '@/store'
export default function getPageTitle(key, fullName) {
const title = store.getters.sysConfig.title || "JNPF快速开发平台"
const title = store.getters.sysConfig.title || "智慧管家平台"
const realTitle = getLanguage() === 'en' ? title : getLanguage() === 'zhtw' ? title : title
const hasKey = i18n.te(`route.${key}`)
if (hasKey) {

@ -155,7 +155,7 @@ export default {
opinionData: ["3", "2", "4", "4", "5"],
massageList: [
{ title: '【通知】中秋国庆双节放假通知', listDate: '2020-09-19' },
{ title: '【公告】你好朋友,感谢使用 JNPF快速开发平台新版本', listDate: '2020-09-18' },
{ title: '【公告】你好朋友,感谢使用 智慧管家平台新版本', listDate: '2020-09-18' },
{ title: '【通知】月饼发放通知,请各部门主管到行政部领取', listDate: '2020-09-17' },
{ title: '【公告】本季度销售之星名单公示', listDate: '2020-09-16' },
{ title: '【通知】公司上班时间调整通知,下月执行', listDate: '2020-09-15' },

@ -57,7 +57,7 @@
</el-table-column>
<el-table-column label="服务商分类" prop="calssify" align="center" sortable width="150" fixed="left">
<template slot-scope="scope">
{{ scope.row.calssify}}
{{ scope.row.calssify == '' ? '其他服务商' : (scope.row.calssify == '1' ? '物流服务商' : '加工服务商')}}
</template>
</el-table-column>
<el-table-column prop="enterpriseNature" label="企业性质" align="center" width="150">

@ -57,7 +57,7 @@
</el-table-column>
<el-table-column label="供应商分类" prop="calssify" align="center" sortable width="150" fixed="left">
<template slot-scope="scope">
{{ scope.row.calssify}}
{{ scope.row.calssify == '' ? '三级' : scope.row.calssify}}
</template>
</el-table-column>
<el-table-column prop="enterpriseNature" label="企业性质" align="center" width="150">

@ -82,10 +82,10 @@
</el-table-column>
<el-table-column prop="transitInventorySum" label="在途库存" align="center" width="150" v-if="query.searchDateType != 1">
</el-table-column>
<el-table-column prop="purchasePrice" label="平均采购单价" align="center" width="150">
<!-- <el-table-column prop="purchasePrice" label="平均采购单价" align="center" width="150">
</el-table-column>
<el-table-column prop="totalCost" label="总成本" align="center" width="150">
</el-table-column>
</el-table-column> -->
<el-table-column prop="productTypeName" label="商品类型" align="center" width="150">
</el-table-column>
<el-table-column prop="brandName" label="商品品牌" align="center" width="150">

@ -113,10 +113,10 @@
</el-table-column>
<el-table-column prop="batchNumber" label="批次号" align="center" width="150">
</el-table-column>
<el-table-column prop="purchasePrice" label="平均采购单价" align="center" width="150">
<!-- <el-table-column prop="purchasePrice" label="平均采购单价" align="center" width="150">
</el-table-column>
<el-table-column prop="retailPrice" label="零售价" align="center" width="150">
</el-table-column>
</el-table-column> -->
<!-- <el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">

@ -83,7 +83,7 @@
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<!-- <div class="JNPF-common-head">
<topOpts @add="addFlow()" addText="新建流程"></topOpts>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
@ -91,7 +91,7 @@
@click="initData()" />
</el-tooltip>
</div>
</div>
</div> -->
<JNPF-table v-loading="listLoading" :data="list">
<el-table-column prop="fullName" label="流程标题" show-overflow-tooltip min-width="150">
<template slot-scope="scope">

Loading…
Cancel
Save