소스 검색

日期插件

chengwl 5 년 전
부모
커밋
41cf6452d6
6개의 변경된 파일146개의 추가작업 그리고 13개의 파일을 삭제
  1. 2 1
      composer.json
  2. 120 2
      composer.lock
  3. 1 4
      controllers/SiteController.php
  4. 14 4
      models/Orderreturn.php
  5. 1 1
      models/OrderreturnSearch.php
  6. 8 1
      views/site/_form.php

+ 2 - 1
composer.json

@@ -18,7 +18,8 @@
         "yiisoft/yii2": "~2.0.14",
         "yiisoft/yii2-bootstrap": "~2.0.0",
         "yiisoft/yii2-swiftmailer": "~2.0.0 || ~2.1.0",
-        "phpoffice/phpspreadsheet": "^1.14"
+        "phpoffice/phpspreadsheet": "^1.14",
+        "kartik-v/yii2-widget-datetimepicker": "*"
     },
     "require-dev": {
         "yiisoft/yii2-debug": "~2.1.0",

+ 120 - 2
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6519e9bf8cd9edde555a8156094f3a62",
+    "content-hash": "bd5e2ccae4851be41ed513f3ec9161c3",
     "packages": [
         {
             "name": "bower-asset/bootstrap",
@@ -55,7 +55,7 @@
             "version": "3.5.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/jquery/jquery-dist.git",
+                "url": "git@github.com:jquery/jquery-dist.git",
                 "reference": "4c0e4becb8263bb5b3e6dadc448d8e7305ef8215"
             },
             "dist": {
@@ -361,6 +361,124 @@
             ],
             "time": "2020-06-29T00:56:53+00:00"
         },
+        {
+            "name": "kartik-v/yii2-krajee-base",
+            "version": "v2.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-krajee-base.git",
+                "reference": "9ddb662bdf49fdb671a90853912a40418a26a0dd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/9ddb662bdf49fdb671a90853912a40418a26a0dd",
+                "reference": "9ddb662bdf49fdb671a90853912a40418a26a0dd",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "suggest": {
+                "yiisoft/yii2-bootstrap": "for Krajee extensions to work with Bootstrap 3.x version",
+                "yiisoft/yii2-bootstrap4": "for Krajee extensions to work with Bootstrap 4.x version"
+            },
+            "type": "yii2-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "kartik\\base\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "Base library and foundation components for all Yii2 Krajee extensions.",
+            "homepage": "https://github.com/kartik-v/yii2-krajee-base",
+            "keywords": [
+                "base",
+                "extension",
+                "foundation",
+                "krajee",
+                "widget",
+                "yii2"
+            ],
+            "time": "2019-03-13T17:14:54+00:00"
+        },
+        {
+            "name": "kartik-v/yii2-widget-datetimepicker",
+            "version": "v1.4.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/kartik-v/yii2-widget-datetimepicker.git",
+                "reference": "dadf042cf13cce84a877dff5f1e6893538f370cf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/kartik-v/yii2-widget-datetimepicker/zipball/dadf042cf13cce84a877dff5f1e6893538f370cf",
+                "reference": "dadf042cf13cce84a877dff5f1e6893538f370cf",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "kartik-v/yii2-krajee-base": ">=2.0.0"
+            },
+            "type": "yii2-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "kartik\\datetime\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kartik Visweswaran",
+                    "email": "kartikv2@gmail.com",
+                    "homepage": "http://www.krajee.com/"
+                }
+            ],
+            "description": "Enhanced Yii2 wrapper for the bootstrap datetimepicker plugin (sub repo split from yii2-widgets)",
+            "homepage": "https://github.com/kartik-v/yii2-widget-datetimepicker",
+            "keywords": [
+                "datetime",
+                "extension",
+                "form",
+                "jquery",
+                "picker",
+                "plugin",
+                "select2",
+                "widget",
+                "yii2"
+            ],
+            "time": "2019-05-29T12:28:51+00:00"
+        },
         {
             "name": "maennchen/zipstream-php",
             "version": "2.1.0",

+ 1 - 4
controllers/SiteController.php

@@ -83,11 +83,9 @@ class SiteController extends Controller
         $request = Yii::$app->request;
         $shop = $request->getBodyParam('shop')??1;
         $model = new Orderreturn();
-
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->id]);
         }
-
         return $this->render('create', [
             'model' => $model,
             'shop'=>$shop,
@@ -145,7 +143,6 @@ class SiteController extends Controller
         
         $request = Yii::$app->request;
         $shop = $request->post('shop')??1;
-        // dd($shop);
         $model = new UploadExcel();
         if (Yii::$app->request->isPost) {
             $model->excel = UploadedFile::getInstance($model, 'excel');
@@ -164,7 +161,7 @@ class SiteController extends Controller
                     if(!isset($item['E'])||empty($item['E'])){
                         continue;
                     }
-                    $receiptdate=strtotime(str_replace('.','-',$item['B'])??'');
+                    $receiptdate=str_replace('.','-',$item['B'])??'';
                     $data[]=[
                         $receiptdate,
                         $item['C'],

+ 14 - 4
models/Orderreturn.php

@@ -15,7 +15,7 @@ use Yii;
  * @property string|null $origin_goodsinfo
  * @property string|null $goodsinfo
  * @property string|null $usage
- * @property int|null $receiptdate
+ * @property string|null $receiptdate
  * @property int|null $num
  * @property string|null $mark
  */
@@ -35,8 +35,8 @@ class Orderreturn extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['receiptdate', 'num','shop'], 'integer'],
-            [['deliveryid', 'website', 'customer', 'delivery', 'origin_goodsinfo', 'goodsinfo', 'usage', 'mark'], 'string', 'max' => 255],
+            [[ 'num','shop'], 'integer'],
+            [['deliveryid', 'website', 'customer', 'receiptdate','delivery', 'origin_goodsinfo', 'goodsinfo', 'usage', 'mark'], 'string', 'max' => 255],
         ];
     }
 
@@ -54,7 +54,7 @@ class Orderreturn extends \yii\db\ActiveRecord
             'origin_goodsinfo' => '原订单货物详情',
             'goodsinfo' => '货物详情',
             'usage' => '完好程度',
-            'receiptdate' => '收日期',
+            'receiptdate' => '收日期',
             'num' => '当天序号',
             'mark' => '备注',
             'shop'=>'店铺'
@@ -64,5 +64,15 @@ class Orderreturn extends \yii\db\ActiveRecord
         parent::afterFind();
         $this->receiptdate=date('Y-m-d',$this->receiptdate);
     }
+    public function beforeSave($options = array()){
+        parent::beforeSave($options);
+        $this->receiptdate=strtotime(trim($this->receiptdate));
+        if(empty($this->created_at)){
+            $this->created_at=time();
+        }
+        return $this;
+        // dd($this);
+    }
+
     
 }

+ 1 - 1
models/OrderreturnSearch.php

@@ -17,7 +17,7 @@ class OrderreturnSearch extends Orderreturn
     public function rules()
     {
         return [
-            [['id', 'receiptdate', 'num','shop'], 'integer'],
+            [['id', 'num','shop'], 'integer'],
             [['deliveryid', 'website', 'customer', 'delivery', 'origin_goodsinfo', 'goodsinfo', 'usage', 'mark'], 'safe'],
         ];
     }

+ 8 - 1
views/site/_form.php

@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use kartik\datetime\DateTimePicker;
 
 /* @var $this yii\web\View */
 /* @var $model app\models\Orderreturn */
@@ -26,7 +27,13 @@ use yii\widgets\ActiveForm;
 
     <?= $form->field($model, 'usage')->textInput(['maxlength' => true]) ?>
 
-    <?= $form->field($model, 'receiptdate')->textInput() ?>
+    <?= $form->field($model, 'receiptdate')->widget(DateTimePicker::className(), [
+    'pluginOptions' => [
+        'format' => 'yyyy-mm-dd ',
+        'autoclose' => true,
+    ]     
+
+]) ?>
 
     <?= $form->field($model, 'num')->textInput() ?>