From 2b6c1cc2d97336fd35d4cb7368399924d7004ebb Mon Sep 17 00:00:00 2001
From: linyaostalker <602604991@qq.com>
Date: Wed, 20 Nov 2019 13:52:52 +0800
Subject: [PATCH] =?UTF-8?q?antgoods=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/views/layouts/sidebar.php                        | 1 +
 .../goods/src}/controllers/SupplierController.php        | 6 +++---
 vendor/antgoods/goods/src/models/ars/Supplier.php        | 3 +++
 .../goods/src}/models/searchs/SupplierSearch.php         | 7 ++++---
 .../antgoods/goods/src}/views/supplier/_form.php         | 4 +---
 .../antgoods/goods/src}/views/supplier/_search.php       | 8 +++++---
 .../antgoods/goods/src}/views/supplier/create.php        | 6 +++---
 .../antgoods/goods/src}/views/supplier/index.php         | 6 +++---
 .../antgoods/goods/src}/views/supplier/update.php        | 8 ++++----
 .../antgoods/goods/src}/views/supplier/view.php          | 9 ++++-----
 10 files changed, 31 insertions(+), 27 deletions(-)
 rename {backend => vendor/antgoods/goods/src}/controllers/SupplierController.php (96%)
 mode change 100755 => 100644
 rename {common => vendor/antgoods/goods/src}/models/searchs/SupplierSearch.php (95%)
 mode change 100755 => 100644
 rename {backend => vendor/antgoods/goods/src}/views/supplier/_form.php (87%)
 mode change 100755 => 100644
 rename {backend => vendor/antgoods/goods/src}/views/supplier/_search.php (92%)
 mode change 100755 => 100644
 rename {backend => vendor/antgoods/goods/src}/views/supplier/create.php (56%)
 mode change 100755 => 100644
 rename {backend => vendor/antgoods/goods/src}/views/supplier/index.php (88%)
 mode change 100755 => 100644
 rename {backend => vendor/antgoods/goods/src}/views/supplier/update.php (53%)
 mode change 100755 => 100644
 rename {backend => vendor/antgoods/goods/src}/views/supplier/view.php (72%)
 mode change 100755 => 100644

diff --git a/backend/views/layouts/sidebar.php b/backend/views/layouts/sidebar.php
index 63c126a..7fd5971 100755
--- a/backend/views/layouts/sidebar.php
+++ b/backend/views/layouts/sidebar.php
@@ -26,6 +26,7 @@ use iron\widgets\Menu;
                     ['label' => '后台商品分类', 'url' => ['/antgoods/category/index']],
                     ['label' => '前端商品分类', 'url' => ['/antgoods/shopcategory/index']],
                     ['label' => '品牌管理', 'url' => ['/antgoods/brand/index']],
+                    ['label' => '供应商管理', 'url' => ['/antgoods/supplier/index']],
                 ]
                 ],
                 ['label' => '订单管理', 'url' => '#', 'icon' => 'far fa-list-alt', 'items' => [
diff --git a/backend/controllers/SupplierController.php b/vendor/antgoods/goods/src/controllers/SupplierController.php
old mode 100755
new mode 100644
similarity index 96%
rename from backend/controllers/SupplierController.php
rename to vendor/antgoods/goods/src/controllers/SupplierController.php
index b538566..cdc6a80
--- a/backend/controllers/SupplierController.php
+++ b/vendor/antgoods/goods/src/controllers/SupplierController.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace backend\controllers;
+namespace antgoods\goods\controllers;
 
 use Yii;
-use common\models\ars\Supplier;
-use common\models\searchs\SupplierSearch;
+use antgoods\goods\models\ars\Supplier;
+use antgoods\goods\models\searchs\SupplierSearch;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
diff --git a/vendor/antgoods/goods/src/models/ars/Supplier.php b/vendor/antgoods/goods/src/models/ars/Supplier.php
index 73d51f6..899b173 100644
--- a/vendor/antgoods/goods/src/models/ars/Supplier.php
+++ b/vendor/antgoods/goods/src/models/ars/Supplier.php
@@ -19,6 +19,9 @@ use yii\behaviors\TimestampBehavior;
  */
 class Supplier extends \yii\db\ActiveRecord
 {
+    //是否删除is_delete
+    const IS_DELETE_NO = 0;//未删除
+    const IS_DELETE_YES = 1;//已删除
     /**
      * {@inheritdoc}
      */
diff --git a/common/models/searchs/SupplierSearch.php b/vendor/antgoods/goods/src/models/searchs/SupplierSearch.php
old mode 100755
new mode 100644
similarity index 95%
rename from common/models/searchs/SupplierSearch.php
rename to vendor/antgoods/goods/src/models/searchs/SupplierSearch.php
index ca170c5..916acb7
--- a/common/models/searchs/SupplierSearch.php
+++ b/vendor/antgoods/goods/src/models/searchs/SupplierSearch.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace common\models\searchs;
+namespace antgoods\goods\models\searchs;
 
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use yii\helpers\ArrayHelper;
-use common\models\ars\Supplier;
+use antgoods\goods\models\ars\Supplier;
 
 /**
- * SupplierSearch represents the model behind the search form of `common\models\ars\Supplier`.
+ * SupplierSearch represents the model behind the search form of `antgoods\goods\models\ars\Supplier`.
  */
 class SupplierSearch extends Supplier
 {
@@ -118,6 +118,7 @@ class SupplierSearch extends Supplier
     * 条件筛选
     */
     private function filter($query, $dataProvider){
+        $query->andFilterWhere(['is_delete' => Supplier::IS_DELETE_NO]);
         if (!$this->validate()) {
             // uncomment the following line if you do not want to return any records when validation fails
             // $query->where('0=1');
diff --git a/backend/views/supplier/_form.php b/vendor/antgoods/goods/src/views/supplier/_form.php
old mode 100755
new mode 100644
similarity index 87%
rename from backend/views/supplier/_form.php
rename to vendor/antgoods/goods/src/views/supplier/_form.php
index dde074b..06b6109
--- a/backend/views/supplier/_form.php
+++ b/vendor/antgoods/goods/src/views/supplier/_form.php
@@ -4,7 +4,7 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
 /* @var $this yii\web\View */
-/* @var $model common\models\ars\Supplier */
+/* @var $model antgoods\goods\models\ars\Supplier */
 /* @var $form yii\widgets\ActiveForm */
 ?>
 
@@ -20,8 +20,6 @@ use yii\widgets\ActiveForm;
 
     <?= $form->field($model, 'address')->textInput(['maxlength' => true]) ?>
 
-    <?= $form->field($model, 'is_delete')->textInput() ?>
-
     <div class="form-group">
         <?= Html::submitButton('保存', ['class' => 'btn btn-success']) ?>
         <?= Html::a('返回', ['index'], ['class' => 'btn btn-info']) ?>
diff --git a/backend/views/supplier/_search.php b/vendor/antgoods/goods/src/views/supplier/_search.php
old mode 100755
new mode 100644
similarity index 92%
rename from backend/views/supplier/_search.php
rename to vendor/antgoods/goods/src/views/supplier/_search.php
index f014a90..1f00e41
--- a/backend/views/supplier/_search.php
+++ b/vendor/antgoods/goods/src/views/supplier/_search.php
@@ -15,8 +15,8 @@ use \blobt\widgets\DateRangePicker;
             'validateOnType' => true,
         ]);
 ?>
-<div class="col-sm-12">
-    <div class="dataTables_filter">
+<div class="row">
+    <div class="col">
         <?= $form->field($model, 'id', [
             "template" => "{input}{error}",
             "inputOptions" => [
@@ -28,6 +28,8 @@ use \blobt\widgets\DateRangePicker;
             ]
         ])
         ?>
+    </div>
+    <div class="col">
         <?= $form->field($model, "created_at_range", [
             "template" => "{input}{error}",
             "inputOptions" => [
@@ -38,10 +40,10 @@ use \blobt\widgets\DateRangePicker;
             ]
         ])->widget(DateRangePicker::className());
         ?>
+    </div>
         <div class="form-group">
             <?= Html::submitButton('<i class="fa fa-filter"></i>', ['class' => 'btn btn-default']) ?>
             <?= Html::resetButton('<i class="fa fa-eraser"></i>', ['class' => 'btn btn-default']) ?>
         </div>
-    </div>
 </div>
 <?php ActiveForm::end(); ?>
\ No newline at end of file
diff --git a/backend/views/supplier/create.php b/vendor/antgoods/goods/src/views/supplier/create.php
old mode 100755
new mode 100644
similarity index 56%
rename from backend/views/supplier/create.php
rename to vendor/antgoods/goods/src/views/supplier/create.php
index eeb7fb0..86b9e63
--- a/backend/views/supplier/create.php
+++ b/vendor/antgoods/goods/src/views/supplier/create.php
@@ -3,10 +3,10 @@
 use yii\helpers\Html;
 
 /* @var $this yii\web\View */
-/* @var $model common\models\ars\Supplier */
+/* @var $model antgoods\goods\models\ars\Supplier */
 
-$this->title = '创建 Supplier';
-$this->params['breadcrumbs'][] = ['label' => 'Suppliers', 'url' => ['index']];
+$this->title = '创建供应商';
+$this->params['breadcrumbs'][] = ['label' => '供应商管理', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="supplier-create">
diff --git a/backend/views/supplier/index.php b/vendor/antgoods/goods/src/views/supplier/index.php
old mode 100755
new mode 100644
similarity index 88%
rename from backend/views/supplier/index.php
rename to vendor/antgoods/goods/src/views/supplier/index.php
index 1c15fb2..bad1e50
--- a/backend/views/supplier/index.php
+++ b/vendor/antgoods/goods/src/views/supplier/index.php
@@ -1,17 +1,17 @@
 <?php
 
 use yii\helpers\Html;
-use blobt\grid\GridView;
+use iron\grid\GridView;
 
 /* @var $this yii\web\View */
 /* @var $searchModel common\models\searchs\SupplierSearch */
 /* @var $dataProvider yii\data\ActiveDataProvider */
 
-$this->title = 'Suppliers';
+$this->title = '供应商管理';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="row">
-    <div class="col-xs-12">
+    <div class="col-12">
         <?= GridView::widget([
                 'dataProvider' => $dataProvider,
                 'filter' => $this->render("_search", ['model' => $searchModel]),
diff --git a/backend/views/supplier/update.php b/vendor/antgoods/goods/src/views/supplier/update.php
old mode 100755
new mode 100644
similarity index 53%
rename from backend/views/supplier/update.php
rename to vendor/antgoods/goods/src/views/supplier/update.php
index b2b5eec..04906ee
--- a/backend/views/supplier/update.php
+++ b/vendor/antgoods/goods/src/views/supplier/update.php
@@ -3,12 +3,12 @@
 use yii\helpers\Html;
 
 /* @var $this yii\web\View */
-/* @var $model common\models\ars\Supplier */
+/* @var $model antgoods\goods\models\ars\Supplier */
 
-$this->title = '编辑 Supplier: ' . $model->name;
-$this->params['breadcrumbs'][] = ['label' => 'Suppliers', 'url' => ['index']];
+$this->title = '编辑供应商: ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => '供应商管理', 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]];
-$this->params['breadcrumbs'][] = 'Update ';
+$this->params['breadcrumbs'][] = '编辑 ';
 ?>
 <div class="supplier-update">
 
diff --git a/backend/views/supplier/view.php b/vendor/antgoods/goods/src/views/supplier/view.php
old mode 100755
new mode 100644
similarity index 72%
rename from backend/views/supplier/view.php
rename to vendor/antgoods/goods/src/views/supplier/view.php
index 9fef302..f9a1fd2
--- a/backend/views/supplier/view.php
+++ b/vendor/antgoods/goods/src/views/supplier/view.php
@@ -4,10 +4,10 @@ use yii\helpers\Html;
 use yii\widgets\DetailView;
 
 /* @var $this yii\web\View */
-/* @var $model common\models\ars\Supplier */
+/* @var $model antgoods\goods\models\ars\Supplier */
 
 $this->title = $model->name;
-$this->params['breadcrumbs'][] = ['label' => 'Suppliers', 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => '供应商管理', 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 \yii\web\YiiAsset::register($this);
 ?>
@@ -25,9 +25,8 @@ $this->params['breadcrumbs'][] = $this->title;
             'full_name',
             'phone',
             'address',
-            'is_delete',
-            'created_at',
-            'updated_at',
+            'created_at:datetime',
+            'updated_at:datetime',
         ],
     ]) ?>