Skip to content

D
dsyerp
Commit 723a473e authored by sugar's avatar sugar
Browse files
Options

Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/dsyerp into dev

parents 360144cd bd23779c
Hide whitespace changes
Inline Side-by-side
Showing with 324 additions and 2545 deletions
data/cache/Doctrine/DoctrineORMModule/Proxy/__CG__AdminEntityAdminUserGroup.php deleted 100644 → 0
View file @ 360144cd
<?php
namespace DoctrineORMModule\Proxy\__CG__\Admin\Entity;
/**
* DO NOT EDIT THIS FILE - IT WAS CREATED BY DOCTRINE'S PROXY GENERATOR
*/
class AdminUserGroup extends \Admin\Entity\AdminUserGroup implements \Doctrine\ORM\Proxy\Proxy
{
/**
* @var \Closure the callback responsible for loading properties in the proxy object. This callback is called with
* three parameters, being respectively the proxy object to be initialized, the method that triggered the
* initialization process and an array of ordered parameters that were passed to that method.
*
* @see \Doctrine\Common\Proxy\Proxy::__setInitializer
*/
public $__initializer__;
/**
* @var \Closure the callback responsible of loading properties that need to be copied in the cloned object
*
* @see \Doctrine\Common\Proxy\Proxy::__setCloner
*/
public $__cloner__;
/**
* @var boolean flag indicating if this object was already initialized
*
* @see \Doctrine\Persistence\Proxy::__isInitialized
*/
public $__isInitialized__ = false;
/**
* @var array<string, null> properties to be lazy loaded, indexed by property name
*/
public static $lazyPropertiesNames = array (
);
/**
* @var array<string, mixed> default values of properties to be lazy loaded, with keys being the property names
*
* @see \Doctrine\Common\Proxy\Proxy::__getLazyProperties
*/
public static $lazyPropertiesDefaults = array (
);
public function __construct(?\Closure $initializer = null, ?\Closure $cloner = null)
{
$this->__initializer__ = $initializer;
$this->__cloner__ = $cloner;
}
/**
*
* @return array
*/
public function __sleep()
{
if ($this->__isInitialized__) {
return ['__isInitialized__', '' . "\0" . 'Admin\\Entity\\AdminUserGroup' . "\0" . 'adminGroupId', '' . "\0" . 'Admin\\Entity\\AdminUserGroup' . "\0" . 'adminGroupName', '' . "\0" . 'Admin\\Entity\\AdminUserGroup' . "\0" . 'adminGroupPurview', '' . "\0" . 'Admin\\Entity\\AdminUserGroup' . "\0" . 'users'];
}
return ['__isInitialized__', '' . "\0" . 'Admin\\Entity\\AdminUserGroup' . "\0" . 'adminGroupId', '' . "\0" . 'Admin\\Entity\\AdminUserGroup' . "\0" . 'adminGroupName', '' . "\0" . 'Admin\\Entity\\AdminUserGroup' . "\0" . 'adminGroupPurview', '' . "\0" . 'Admin\\Entity\\AdminUserGroup' . "\0" . 'users'];
}
/**
*
*/
public function __wakeup()
{
if ( ! $this->__isInitialized__) {
$this->__initializer__ = function (AdminUserGroup $proxy) {
$proxy->__setInitializer(null);
$proxy->__setCloner(null);
$existingProperties = get_object_vars($proxy);
foreach ($proxy::$lazyPropertiesDefaults as $property => $defaultValue) {
if ( ! array_key_exists($property, $existingProperties)) {
$proxy->$property = $defaultValue;
}
}
};
}
}
/**
*
*/
public function __clone()
{
$this->__cloner__ && $this->__cloner__->__invoke($this, '__clone', []);
}
/**
* Forces initialization of the proxy
*/
public function __load(): void
{
$this->__initializer__ && $this->__initializer__->__invoke($this, '__load', []);
}
/**
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __isInitialized(): bool
{
return $this->__isInitialized__;
}
/**
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setInitialized($initialized): void
{
$this->__isInitialized__ = $initialized;
}
/**
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setInitializer(\Closure $initializer = null): void
{
$this->__initializer__ = $initializer;
}
/**
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __getInitializer(): ?\Closure
{
return $this->__initializer__;
}
/**
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
*/
public function __setCloner(\Closure $cloner = null): void
{
$this->__cloner__ = $cloner;
}
/**
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific cloning logic
*/
public function __getCloner(): ?\Closure
{
return $this->__cloner__;
}
/**
* {@inheritDoc}
* @internal generated method: use only when explicitly handling proxy specific loading logic
* @deprecated no longer in use - generated code now relies on internal components rather than generated public API
* @static
*/
public function __getLazyProperties(): array
{
return self::$lazyPropertiesDefaults;
}
/**
* {@inheritDoc}
*/
public function addUsers($user)
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'addUsers', [$user]);
return parent::addUsers($user);
}
/**
* {@inheritDoc}
*/
public function getAdminGroupId()
{
if ($this->__isInitialized__ === false) {
return (int) parent::getAdminGroupId();
}
$this->__initializer__ && $this->__initializer__->__invoke($this, 'getAdminGroupId', []);
return parent::getAdminGroupId();
}
/**
* {@inheritDoc}
*/
public function setAdminGroupId($adminGroupId)
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'setAdminGroupId', [$adminGroupId]);
return parent::setAdminGroupId($adminGroupId);
}
/**
* {@inheritDoc}
*/
public function getAdminGroupName()
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'getAdminGroupName', []);
return parent::getAdminGroupName();
}
/**
* {@inheritDoc}
*/
public function setAdminGroupName($adminGroupName)
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'setAdminGroupName', [$adminGroupName]);
return parent::setAdminGroupName($adminGroupName);
}
/**
* {@inheritDoc}
*/
public function getAdminGroupPurview()
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'getAdminGroupPurview', []);
return parent::getAdminGroupPurview();
}
/**
* {@inheritDoc}
*/
public function setAdminGroupPurview($adminGroupPurview)
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'setAdminGroupPurview', [$adminGroupPurview]);
return parent::setAdminGroupPurview($adminGroupPurview);
}
/**
* {@inheritDoc}
*/
public function valuesArray()
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'valuesArray', []);
return parent::valuesArray();
}
/**
* {@inheritDoc}
*/
public function valuesSet(array $data)
{
$this->__initializer__ && $this->__initializer__->__invoke($this, 'valuesSet', [$data]);
return parent::valuesSet($data);
}
}
data/cache/module-config-cache.application.config.cache.php deleted 100644 → 0
View file @ 360144cd
This source diff could not be displayed because it is too large. You can view the blob instead.
module/Admin/view/admin/home/index.phtml
View file @ 723a473e
......@@ -28,12 +28,12 @@
</script>
<?php } ?>
<?php if (empty($this->serviceBind['key'])) { ?>
<div class="col-md-12">
<!--<div class="col-md-12">
<div class="callout callout-danger">
<h4><?php echo $this->translate('重要提示'); ?></h4>
<p><?php echo $this->translate('您还没有进行服务绑定，官方建议您优先进行服务绑定处理。绑定后，可以在线进行系统更新、插件安装等等，进一步对系统进行优化。'); ?> <a href="<?php echo $this->url('service-bind'); ?>" class="btn btn-success" style="text-decoration: none;"><?php echo $this->translate('点击去设置服务绑定'); ?></a></p>
<h4><?php /*echo $this->translate('重要提示'); */?></h4>
<p><?php /*echo $this->translate('您还没有进行服务绑定，官方建议您优先进行服务绑定处理。绑定后，可以在线进行系统更新、插件安装等等，进一步对系统进行优化。'); */?> <a href="<?php /*echo $this->url('service-bind'); */?>" class="btn btn-success" style="text-decoration: none;"><?php /*echo $this->translate('点击去设置服务绑定'); */?></a></p>
</div>
</div>
</div>-->
<?php } ?>
<?php if ($this->newPackage == 1 || $this->pluginPackage == 1) { ?>
......@@ -232,7 +232,7 @@
<th><?php echo $this->translate('PHP版本'); ?></th>
<td><?php echo phpversion(); ?></td>
<th><?php echo $this->translate('官方网站'); ?></th>
<td><a href="https://www.dberp.net/" target="_blank">https://www.dberp.net/</a></td>
<td><a href="http://dsyerp.jxdsy.cn/" target="_blank">http://dsyerp.jxdsy.cn/</a></td>
</tr>
<tr>
<th><?php echo $this->translate('在线手册'); ?></th>
......
module/Admin/view/admin/index/index.phtml
View file @ 723a473e
......@@ -21,7 +21,7 @@
<body class="hold-transition login-page">
<div class="login-box">
<div class="login-logo">
<b>DBE</b>RP <?php echo $this->translate('进销存'); ?>
<b>点点达ERP</b><?php echo $this->translate('进销存'); ?>
</div>
<div class="login-box-body">
......@@ -50,7 +50,6 @@
]);
$form->prepare();
?>
<?php echo $this->form()->openTag($form); ?>
<div class="form-group">
<div class="input-group">
......@@ -81,7 +80,6 @@
<?php echo $this->formElement($form->get('submit-login')); ?>
</div>
<div class="col-xs-12 text-center" style="margin-top: 15px;">
Copyright © <a href="https://www.dberp.net/" target="_blank">北京珑大钜商科技有限公司</a> 版权所有
<?php if ($this->adminHelper()->erp('website_icp')) echo '<br><a href="https://beian.miit.gov.cn/" target="_blank">'.$this->adminHelper()->erp('website_icp').'</a>'; ?>
</div>
</div>
......
module/Admin/view/layout/footer.phtml
View file @ 723a473e
......@@ -2,5 +2,5 @@
<div class="pull-right hidden-xs">
<?php echo DBERP_VERSION; ?>
</div>
Copyright &copy; <?php echo date("Y"); ?> <a href="https://www.dberp.net" target="_blank">DBErp 进销存</a>
Copyright &copy; <?php echo date("Y"); ?> <a href="http://dsyerp.jxdsy.cn" target="_blank">点点达erp 进销存</a>
</footer>
\ No newline at end of file
module/Admin/view/layout/header.phtml
View file @ 723a473e
<header class="main-header">
<a href="<?php echo $this->url('home');?>" class="logo">
<span class="logo-mini"><b>E</b>RP</span>
<span class="logo-lg"><b>DBE</b>RP</span>
<span class="logo-lg"><b>点点达E</b>RP</span>
</a>
<nav class="navbar navbar-static-top">
<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
......@@ -47,10 +47,9 @@
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<li>
<a href="https://store.loongdom.cn/" target="_blank" title="<?php echo $this->translate('应用商城'); ?>"><i class="fa fa-shopping-bag fa-lg"></i> <span class="hidden-xs"><?php echo $this->translate('应用商城'); ?></span></a>
</li>
<!--<li>
<a href="https://store.loongdom.cn/" target="_blank" title="<?php /*echo $this->translate('应用商城'); */?>"><i class="fa fa-shopping-bag fa-lg"></i> <span class="hidden-xs"><?php /*echo $this->translate('应用商城'); */?></span></a>
</li>-->
<?php
$languageArray = $this->adminHelper()->erpMoreLanguage();
if (is_array($languageArray) && count($languageArray) > 1) {
......
module/Admin/view/layout/layout.phtml
View file @ 723a473e
......@@ -6,12 +6,12 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<?php
$this->headtitle('DBERP 进销存系统');
$this->headtitle('Powered by 珑大软件');
$this->headtitle('点点达ERP 进销存系统');
$this->headtitle('');
echo $this->headTitle()->setSeparator(' - ');
$this->headMeta()->appendName('author', '北京珑大钜商科技有限公司');
$this->headMeta()->appendName('copyright', 'DBErp Inc. All Rights Reserved');
$this->headMeta()->appendName('author', '江西速达车洗汽车服务有限公司');
$this->headMeta()->appendName('copyright', '');
$this->headMeta()->setAutoEscape(false);
......
module/Admin/view/layout/left-menu.phtml
View file @ 723a473e
......@@ -47,12 +47,12 @@
</a>
</li>
<?php } ?>
<li <?php echo $this->controllerName == 'ServiceBindController' ? 'class="active"' : ''; ?>>
<a href="<?php echo $this->url('service-bind'); ?>"><?php echo $this->translate('服务绑定'); ?></a>
</li>
<li <?php echo $this->controllerName == 'UpdateController' ? 'class="active"' : ''; ?>>
<a href="<?php echo $this->url('update'); ?>"><?php echo $this->translate('系统更新'); ?></a>
<!--<li <?php /*echo $this->controllerName == 'ServiceBindController' ? 'class="active"' : ''; */?>>
<a href="<?php /*echo $this->url('service-bind'); */?>"><?php /*echo $this->translate('服务绑定'); */?></a>
</li>
<li <?php /*echo $this->controllerName == 'UpdateController' ? 'class="active"' : ''; */?>>
<a href="<?php /*echo $this->url('update'); */?>"><?php /*echo $this->translate('系统更新'); */?></a>
</li>-->
<li <?php echo $this->controllerName == 'OperLogController' ? 'class="active"' : ''; ?>>
<a href="<?php echo $this->url('oper-log'); ?>">
<?php echo $this->translate('操作日志'); ?>
......
module/Purchase/src/Entity/Order.php
View file @ 723a473e
......@@ -113,6 +113,12 @@ class Order extends BaseEntity
*/
private $adminId;
/**
* 采购时间
* @ORM\Column(name="create_time", type="integer", length=10)
*/
private $createTime;
/**
* 供应商
* @ORM\ManyToOne(targetEntity="Customer\Entity\Supplier", inversedBy="orders")
......@@ -354,4 +360,20 @@ class Order extends BaseEntity
$this->adminId = $adminId;
}
/**
* @return mixed
*/
public function getCreateTime()
{
return $this->createTime;
}
/**
* @param mixed $createTime
*/
public function setCreateTime($createTime)
{
$this->createTime = $createTime;
}
}
\ No newline at end of file
module/Purchase/src/Entity/WarehouseOrder.php
View file @ 723a473e
......@@ -92,6 +92,12 @@ class WarehouseOrder extends BaseEntity
* @ORM\Column(name="admin_id", type="integer", length=11)
*/
private $adminId;
/**
* 采购时间
* @ORM\Column(name="create_time", type="integer", length=10)
*/
private $createTime;
/**
* @var
......@@ -314,5 +320,19 @@ class WarehouseOrder extends BaseEntity
{
$this->adminId = $adminId;
}
/**
* @return mixed
*/
public function getCreateTime()
{
return $this->createTime;
}
/**
* @param mixed $createTime
*/
public function setCreateTime($createTime)
{
$this->createTime = $createTime;
}
}
\ No newline at end of file
module/Purchase/src/Form/SearchOrderForm.php
View file @ 723a473e
......@@ -121,6 +121,26 @@ class SearchOrderForm extends Form
'class' => 'form-control input-sm'
]
]);
$this->add([
'type' => 'text',
'name' => 'start_time',
'attributes' => [
'id' => 'start_time',
'class' => 'form-control input-sm',
'placeholder' => $this->translator->translate('起始时间')
]
]);
$this->add([
'type' => 'text',
'name' => 'end_time',
'attributes' => [
'id' => 'end_time',
'class' => 'form-control input-sm',
'placeholder' => $this->translator->translate('结束时间')
]
]);
}
public function addInputFilter()
......@@ -198,5 +218,22 @@ class SearchOrderForm extends Form
'name' => 'return_state',
'required' => false
]);
$inputFilter->add([
'name' => 'start_time',
'required' => false,
'filters' => [
['name' => 'StringTrim'],
['name' => 'StripTags']
]
]);
$inputFilter->add([
'name' => 'end_time',
'required' => false,
'filters' => [
['name' => 'StringTrim'],
['name' => 'StripTags']
]
]);
}
}
\ No newline at end of file
module/Purchase/src/Form/SearchOrderReturnForm.php
View file @ 723a473e
......@@ -103,6 +103,25 @@ class SearchOrderReturnForm extends Form
'class' => 'form-control input-sm'
]
]);
$this->add([
'type' => 'text',
'name' => 'start_time',
'attributes' => [
'id' => 'start_time',
'class' => 'form-control input-sm',
'placeholder' => $this->translator->translate('起始时间')
]
]);
$this->add([
'type' => 'text',
'name' => 'end_time',
'attributes' => [
'id' => 'end_time',
'class' => 'form-control input-sm',
'placeholder' => $this->translator->translate('结束时间')
]
]);
}
public function addInputFilter()
......@@ -167,5 +186,23 @@ class SearchOrderReturnForm extends Form
'name' => 'return_state',
'required' => false
]);
$inputFilter->add([
'name' => 'start_time',
'required' => false,
'filters' => [
['name' => 'StringTrim'],
['name' => 'StripTags']
]
]);
$inputFilter->add([
'name' => 'end_time',
'required' => false,
'filters' => [
['name' => 'StringTrim'],
['name' => 'StripTags']
]
]);
}
}
\ No newline at end of file
module/Purchase/src/Form/SearchWarehouseOrderForm.php
View file @ 723a473e
......@@ -112,6 +112,25 @@ class SearchWarehouseOrderForm extends Form
'class' => 'form-control input-sm'
]
]);
$this->add([
'type' => 'text',
'name' => 'start_time',
'attributes' => [
'id' => 'start_time',
'class' => 'form-control input-sm',
'placeholder' => $this->translator->translate('起始时间')
]
]);
$this->add([
'type' => 'text',
'name' => 'end_time',
'attributes' => [
'id' => 'end_time',
'class' => 'form-control input-sm',
'placeholder' => $this->translator->translate('结束时间')
]
]);
}
public function addInputFilter()
......@@ -187,5 +206,22 @@ class SearchWarehouseOrderForm extends Form
['name' => 'ToInt']
]
]);
$inputFilter->add([
'name' => 'start_time',
'required' => false,
'filters' => [
['name' => 'StringTrim'],
['name' => 'StripTags']
]
]);
$inputFilter->add([
'name' => 'end_time',
'required' => false,
'filters' => [
['name' => 'StringTrim'],
['name' => 'StripTags']
]
]);
}
}
\ No newline at end of file
module/Purchase/src/Repository/OrderRepository.php
View file @ 723a473e
......@@ -48,6 +48,8 @@ class OrderRepository extends EntityRepository
if(isset($search['payment_code']) && !empty($search['payment_code'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('o.paymentCode', ':code'))->setParameter('code', $search['payment_code']);
if(isset($search['p_order_state']) && is_numeric($search['p_order_state'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('o.pOrderState', $search['p_order_state']));
if(isset($search['return_state']) && is_numeric($search['return_state'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('o.returnState', $search['return_state']));
if(isset($search['start_time']) && !empty($search['start_time'])) $queryBuilder->andWhere($queryBuilder->expr()->gte('o.createTime', ':startTime'))->setParameter('startTime', strtotime($search['start_time']));
if(isset($search['end_time']) && !empty($search['end_time'])) $queryBuilder->andWhere($queryBuilder->expr()->lte('o.createTime', ':endTime'))->setParameter('endTime', strtotime($search['end_time']));
return $queryBuilder;
}
......
module/Purchase/src/Repository/OrderReturnRepository.php
View file @ 723a473e
......@@ -47,6 +47,8 @@ class OrderReturnRepository extends EntityRepository
if(isset($search['supplier_phone']) && !empty($search['supplier_phone'])) $queryBuilder->andWhere($queryBuilder->expr()->like('p.supplierPhone', "'%".$search['supplier_phone']."%'"));
if(isset($search['supplier_id']) && $search['supplier_id'] > 0) $queryBuilder->andWhere($queryBuilder->expr()->eq('p.supplierId', $search['supplier_id']));
if(isset($search['return_state']) && !empty($search['return_state'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('o.returnState', $search['return_state']));
if(isset($search['start_time']) && !empty($search['start_time'])) $queryBuilder->andWhere($queryBuilder->expr()->gte('o.createTime', ':startTime'))->setParameter('startTime', strtotime($search['start_time']));
if(isset($search['end_time']) && !empty($search['end_time'])) $queryBuilder->andWhere($queryBuilder->expr()->lte('o.createTime', ':endTime'))->setParameter('endTime', strtotime($search['end_time']));
return $queryBuilder;
}
......
module/Purchase/src/Repository/WarehouseOrderRepository.php
View file @ 723a473e
......@@ -48,6 +48,8 @@ class WarehouseOrderRepository extends EntityRepository
if(isset($search['supplier_id']) && $search['supplier_id'] > 0) $queryBuilder->andWhere($queryBuilder->expr()->eq('o.supplierId', $search['supplier_id']));
if(isset($search['payment_code']) && !empty($search['payment_code'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('o.paymentCode', ':code'))->setParameter('code', $search['payment_code']);
if(isset($search['p_order_state']) && !empty($search['p_order_state'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('o.pOrderState', $search['p_order_state']));
if(isset($search['start_time']) && !empty($search['start_time'])) $queryBuilder->andWhere($queryBuilder->expr()->gte('w.createTime', ':startTime'))->setParameter('startTime', strtotime($search['start_time']));
if(isset($search['end_time']) && !empty($search['end_time'])) $queryBuilder->andWhere($queryBuilder->expr()->lte('w.createTime', ':endTime'))->setParameter('endTime', strtotime($search['end_time']));
return $queryBuilder;
}
......
module/Purchase/src/Service/OrderManager.php
View file @ 723a473e
......@@ -49,6 +49,7 @@ class OrderManager
$order->setAdminId($adminId);
$order->setOneSupplier($supplier);
$order->setCreateTime(time());
$array = ['pOrderGoodsAmount' => 0, 'pOrderTaxAmount' => 0, 'pOrderAmount' => 0];
foreach ($goodsData['goodsId'] as $key => $value) {
......
module/Purchase/src/Service/WarehouseOrderManager.php
View file @ 723a473e
......@@ -57,6 +57,7 @@ class WarehouseOrderManager
$warehouseOrder->setAdminId($adminId);
$warehouseOrder->setOneOrder($order);
$warehouseOrder->setOneWarehouse($warehouseInfo);
$warehouseOrder->setCreateTime(time());
$this->entityManager->persist($warehouseOrder);
$this->entityManager->flush();
......
module/Purchase/view/purchase/order-return/index.phtml
View file @ 723a473e
......@@ -26,6 +26,7 @@
<th width="10%"><?php echo $this->translate('联系电话'); ?></th>
<th width="10%"><?php echo $this->translate('退货金额'); ?></th>
<th width="6%"><?php echo $this->translate('状态'); ?></th>
<th width="10%"><?php echo $this->translate('退货时间'); ?></th>
<th width="15%"><?php echo $this->translate('操作'); ?></th>
</tr>
<?php
......@@ -65,6 +66,16 @@
<?php echo $this->formElement($sForm->get('return_state')); ?>
<?php echo $this->formElementErrors($sForm->get('return_state'), ['class'=>'error-message']);?>
</td>
<td>
<p>
<?php echo $this->formElement($sForm->get('start_time')); ?>
</p>
<div>
<?php echo $this->formElement($sForm->get('end_time')); ?>
</div>
<?php echo $this->formElementErrors($sForm->get('start_time'), ['class'=>'error-message']); ?>
<?php echo $this->formElementErrors($sForm->get('end_time'), ['class'=>'error-message']); ?>
</td>
<td>
<button type="submit" class="btn btn-info btn-sm"><i class="fa fa-search"></i></button>
<?php if(!empty(array_filter($sForm->getData()))) { ?>
......@@ -83,6 +94,7 @@
<td><?php echo $this->escapeHtml($order->getOnePOrder()->getSupplierPhone()); ?></td>
<td><?php echo $this->erpCurrencyFormat($order->getPOrderReturnAmount());?></td>
<td><?php echo $this->PurchaseHelper()->orderReturnState($order->getReturnState(), 2); ?></td>
<td><?php echo date("Y-m-d H:i", $order->getReturnTime()); ?></td>
<td>
<a href="<?php echo $this->url('order-return',
['action'=>'view', 'id'=>$order->getOrderReturnId()]); ?>" class="btn btn-xs btn-info"><i class="fa fa-info-circle"></i> <?php echo $this->translate('查看'); ?></a>
......
module/Purchase/view/purchase/order-return/view.phtml
View file @ 723a473e
......@@ -63,7 +63,12 @@
</div>
<div class="row">
<div class="col-xs-12 form-group">
<div class="col-xs-4 form-group">
<div class="col-sm-12">
<b><?php echo $this->translate('采购退货时间'); ?>：</b><?php echo date("Y-m-d H:i:s", $this->returnInfo->getreturnTime());?>
</div>
</div>
<div class="col-xs-8 form-group">
<div class="col-sm-12">
<b><?php echo $this->translate('备注'); ?>：</b><?php echo $this->escapeHtml($this->returnInfo->getPOrderReturnInfo());?>
</div>
......
module/Purchase/view/purchase/order/index.phtml
View file @ 723a473e
......@@ -29,6 +29,7 @@
<th width="10%"><?php echo $this->translate('采购金额'); ?></th>
<th width="6%"><?php echo $this->translate('状态'); ?></th>
<th width="6%"><?php echo $this->translate('退货'); ?></th>
<th width="10%"><?php echo $this->translate('时间'); ?></th>
<th width="15%"><?php echo $this->translate('操作'); ?></th>
</tr>
<?php
......@@ -77,6 +78,16 @@
<?php echo $this->formElement($sForm->get('return_state')); ?>
<?php echo $this->formElementErrors($sForm->get('return_state'), ['class'=>'error-message']);?>
</td>
<td>
<p>
<?php echo $this->formElement($sForm->get('start_time')); ?>
</p>
<div>
<?php echo $this->formElement($sForm->get('end_time')); ?>
</div>
<?php echo $this->formElementErrors($sForm->get('start_time'), ['class'=>'error-message']); ?>
<?php echo $this->formElementErrors($sForm->get('end_time'), ['class'=>'error-message']); ?>
</td>
<td>
<button type="submit" class="btn btn-info btn-sm"><i class="fa fa-search"></i></button>
<?php
......@@ -101,6 +112,7 @@
<td><?php echo $this->erpCurrencyFormat($order->getPOrderAmount());?></td>
<td><?php echo $this->PurchaseHelper()->orderState($order->getPOrderState(), 2); ?></td>
<td><?php echo ($order->getReturnState() == 1 ? '<b class="text-danger">'.$this->translate('有').'</b>' : $this->translate('无')); ?></td>
<td><?php echo date("Y-m-d H:i", $order->getCreateTime()); ?></td>
<td>
<?php if($order->getPOrderState() == 0) { ?>
<a href="<?php echo $this->url('p-order',
......@@ -140,4 +152,8 @@
</div>
</section>
</div>
\ No newline at end of file
</div>
<script type="text/javascript">
laydate.render({elem: '#start_time'});
laydate.render({elem: '#end_time'});
</script>
\ No newline at end of file
module/Purchase/view/purchase/order/view.phtml
View file @ 723a473e
......@@ -67,7 +67,12 @@
<b><?php echo $this->translate('供应商座机'); ?>：</b><?php echo $this->escapeHtml($this->orderInfo->getSupplierTelephone());?>
</div>
</div>
<div class="col-xs-8 form-group">
<div class="col-xs-4 form-group">
<div class="col-sm-12">
<b><?php echo $this->translate('采购时间'); ?>：</b><?php echo date("Y-m-d H:i:s", $this->orderInfo->getCreateTime());?>
</div>
</div>
<div class="col-xs-4 form-group">
<div class="col-sm-12">
<b><?php echo $this->translate('备注'); ?>：</b><?php echo $this->escapeHtml($this->orderInfo->getPOrderInfo());?>
</div>
......
module/Purchase/view/purchase/warehouse-order/index.phtml
View file @ 723a473e
......@@ -27,6 +27,7 @@
<th width="10%"><?php echo $this->translate('付款方式'); ?></th>
<th width="10%"><?php echo $this->translate('采购金额'); ?></th>
<th width="6%"><?php echo $this->translate('状态'); ?></th>
<th width="10%"><?php echo $this->translate('时间'); ?></th>
<th width="12%"><?php echo $this->translate('操作'); ?></th>
</tr>
<?php
......@@ -70,6 +71,16 @@
<?php echo $this->formElement($sForm->get('p_order_state')); ?>
<?php echo $this->formElementErrors($sForm->get('p_order_state'), ['class'=>'error-message']);?>
</td>
<td>
<p>
<?php echo $this->formElement($sForm->get('start_time')); ?>
</p>
<div>
<?php echo $this->formElement($sForm->get('end_time')); ?>
</div>
<?php echo $this->formElementErrors($sForm->get('start_time'), ['class'=>'error-message']); ?>
<?php echo $this->formElementErrors($sForm->get('end_time'), ['class'=>'error-message']); ?>
</td>
<td>
<button type="submit" class="btn btn-info btn-sm"><i class="fa fa-search"></i></button>
<?php if(!empty(array_filter($sForm->getData()))) { ?>
......@@ -89,6 +100,7 @@
<td><?php echo $this->PurchaseHelper()->orderPayment($order->getWarehouseOrderPaymentCode()); ?></td>
<td><?php echo $this->erpCurrencyFormat($order->getWarehouseOrderAmount()); ?></td>
<td><?php echo $this->PurchaseHelper()->orderState($order->getWarehouseOrderState(), 2); ?></td>
<td><?php echo date("Y-m-d H:i", $order->getCreateTime()); ?></td>
<td>
<a href="<?php echo $this->url('warehouse-order',
['action'=>'view', 'id'=>$order->getWarehouseOrderId()]); ?>"
......
module/Purchase/view/purchase/warehouse-order/view.phtml
View file @ 723a473e
......@@ -91,7 +91,12 @@
</div>
<div class="row">
<div class="col-xs-12 form-group">
<div class="col-xs-4 form-group">
<div class="col-sm-12">
<b><?php echo $this->translate('采购入库时间'); ?>：</b><?php echo date("Y-m-d H:i:s", $this->orderInfo->getCreateTime());?>
</div>
</div>
<div class="col-xs-8 form-group">
<div class="col-sm-12">
<b><?php echo $this->translate('备注'); ?>：</b><?php echo $this->escapeHtml($this->orderInfo->getPOrderInfo());?>
</div>
......
module/Sales/src/Entity/SalesOrder.php
View file @ 723a473e
......@@ -118,6 +118,13 @@ class SalesOrder extends BaseEntity
*/
private $adminId;
/**
* 采购时间
* @ORM\Column(name="create_time", type="integer", length=10)
*/
private $createTime;
/**
* @var
* @ORM\OneToOne(targetEntity="Customer\Entity\Customer")
......@@ -365,6 +372,23 @@ class SalesOrder extends BaseEntity
$this->adminId = $adminId;
}
/**
* @return mixed
*/
public function getCreateTime()
{
return $this->createTime;
}
/**
* @param mixed $createTime
*/
public function setCreateTime($createTime)
{
$this->createTime = $createTime;
}
/**
* @return mixed
*/
......@@ -380,4 +404,5 @@ class SalesOrder extends BaseEntity
{
$this->oneCustomer = $oneCustomer;
}
}
\ No newline at end of file
module/Sales/src/Form/SearchSalesOrderForm.php
View file @ 723a473e
......@@ -121,6 +121,26 @@ class SearchSalesOrderForm extends Form
'class' => 'form-control input-sm'
]
]);
$this->add([
'type' => 'text',
'name' => 'start_time',
'attributes' => [
'id' => 'start_time',
'class' => 'form-control input-sm',
'placeholder' => $this->translator->translate('起始时间')
]
]);
$this->add([
'type' => 'text',
'name' => 'end_time',
'attributes' => [
'id' => 'end_time',
'class' => 'form-control input-sm',
'placeholder' => $this->translator->translate('结束时间')
]
]);
}
public function addInputFilter()
......@@ -198,5 +218,23 @@ class SearchSalesOrderForm extends Form
'name' => 'return_state',
'required' => false
]);
$inputFilter->add([
'name' => 'start_time',
'required' => false,
'filters' => [
['name' => 'StringTrim'],
['name' => 'StripTags']
]
]);
$inputFilter->add([
'name' => 'end_time',
'required' => false,
'filters' => [
['name' => 'StringTrim'],
['name' => 'StripTags']
]
]);
}
}
\ No newline at end of file
module/Sales/src/Repository/SalesOrderRepository.php
View file @ 723a473e
......@@ -50,6 +50,8 @@ class SalesOrderRepository extends EntityRepository
if(isset($search['receivables_code']) && !empty($search['receivables_code'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('s.receivablesCode', ':code'))->setParameter('code', $search['receivables_code']);
if(isset($search['sales_order_state']) && is_numeric($search['sales_order_state'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('s.salesOrderState', $search['sales_order_state']));
if(isset($search['return_state']) && is_numeric($search['return_state'])) $queryBuilder->andWhere($queryBuilder->expr()->eq('s.returnState', $search['return_state']));
if(isset($search['start_time']) && !empty($search['start_time'])) $queryBuilder->andWhere($queryBuilder->expr()->gte('s.createTime', ':startTime'))->setParameter('startTime', strtotime($search['start_time']));
if(isset($search['end_time']) && !empty($search['end_time'])) $queryBuilder->andWhere($queryBuilder->expr()->lte('s.createTime', ':endTime'))->setParameter('endTime', strtotime($search['end_time']));
return $queryBuilder;
}
......
module/Sales/src/Service/SalesOrderManager.php
View file @ 723a473e
......@@ -50,6 +50,7 @@ class SalesOrderManager
$salesOrder->setReturnState(0);
$salesOrder->setAdminId($adminId);
$salesOrder->setOneCustomer($customerInfo);
$salesOrder->setCreateTime(time());
$array = ['salesOrderGoodsAmount' => 0, 'salesOrderTaxAmount' => 0, 'salesOrderAmount' => 0];
foreach ($goodsData['goodsId'] as $key => $value) {
......
module/Sales/view/sales/sales-order/index.phtml
View file @ 723a473e
......@@ -29,6 +29,7 @@
<th width="10%"><?php echo $this->translate('收款金额'); ?></th>
<th width="6%"><?php echo $this->translate('状态'); ?></th>
<th width="5%"><?php echo $this->translate('退货'); ?></th>
<th width="10%"><?php echo $this->translate('时间'); ?></th>
<th width="15%"><?php echo $this->translate('操作'); ?></th>
</tr>
<?php
......@@ -77,6 +78,16 @@
<?php echo $this->formElement($sForm->get('return_state')); ?>
<?php echo $this->formElementErrors($sForm->get('return_state'), ['class'=>'error-message']);?>
</td>
<td>
<p>
<?php echo $this->formElement($sForm->get('start_time')); ?>
</p>
<div>
<?php echo $this->formElement($sForm->get('end_time')); ?>
</div>
<?php echo $this->formElementErrors($sForm->get('start_time'), ['class'=>'error-message']); ?>
<?php echo $this->formElementErrors($sForm->get('end_time'), ['class'=>'error-message']); ?>
</td>
<td>
<button type="submit" class="btn btn-info btn-sm"><i class="fa fa-search"></i></button>
<?php
......@@ -101,6 +112,7 @@
<td><?php echo $this->erpCurrencyFormat($order->getSalesOrderAmount());?></td>
<td><?php echo $this->salesHelper()->salesOrderState($order->getSalesOrderState(), 2); ?></td>
<td><?php echo ($order->getReturnState() == 1 ? '<b class="text-danger">'.$this->translate('有').'</b>' : $this->translate('无')); ?></td>
<td><?php echo date("Y-m-d H:i", $order->getCreateTime()); ?></td>
<td>
<?php if($order->getSalesOrderState() == 0) { ?>
<a href="<?php echo $this->url('sales-order',
......
module/Sales/view/sales/sales-order/view.phtml
View file @ 723a473e
......@@ -73,6 +73,13 @@
</div>
</div>
<div class="col-xs-4 form-group">
<div class="col-sm-12">
<b><?php echo $this->translate('销售时间'); ?>：</b><?php echo date("Y-m-d H:i:s", $this->orderInfo->getCreateTime());?>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-8 form-group">
<div class="col-sm-12">
<b><?php echo $this->translate('备注'); ?>：</b><?php echo $this->escapeHtml($this->orderInfo->getSalesOrderInfo());?>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment