diff --git a/app-ht/config/params.php b/app-ht/config/params.php index 6b88b2e..e71a66c 100644 --- a/app-ht/config/params.php +++ b/app-ht/config/params.php @@ -3,5 +3,5 @@ return [ 'adminEmail' => 'tech@jiwork.com', 'DINGTALKL_URL' => 'https://tdd.jiwork.com/', //在钉钉端用系统扫码之后跳转到钉钉对应的界面，里面要指定钉钉的网址 'BAIDU_MAP_BROWSER_KEY' => 'UzLG5fpQtralY2hXO3wvVFzvlCmw6Rue', - 'VERSION' => 'v0.0.1 build 5', + 'VERSION' => 'v0.0.1 build 6', ]; \ No newline at end of file diff --git a/app-ht/modules/manufacturer/controllers/ManufacturerController.php b/app-ht/modules/manufacturer/controllers/ManufacturerController.php index 29c17dd..334a0af 100644 --- a/app-ht/modules/manufacturer/controllers/ManufacturerController.php +++ b/app-ht/modules/manufacturer/controllers/ManufacturerController.php @@ -67,7 +67,7 @@ class ManufacturerController extends BaseController $where[] = ['<=', 'm.created_at', $endTime]; } if ($type == 0) { - $pageList = ManufacturerRepository::getPageList($where); + $pageList = ManufacturerRepository::getPageList($where, 0 , 0); $pages = null; } else { $pageSize = 20; @@ -215,4 +215,13 @@ class ManufacturerController extends BaseController return $this->renderJson($msg); } + /** + * 导出厂商数据 + * @return string + */ + public function actionExport() + { + $params = $this->dataList(0); + return $this->renderPartial('export', $params); + } } \ No newline at end of file diff --git a/app-ht/modules/manufacturer/views/manufacturer/export.php b/app-ht/modules/manufacturer/views/manufacturer/export.php new file mode 100644 index 0000000..e07369a --- /dev/null +++ b/app-ht/modules/manufacturer/views/manufacturer/export.php @@ -0,0 +1,55 @@ + + + + + + + + + +
+ + + + + + + + + + + + $item) : ?> + + + + + + + + + +
厂商名称联系电话账号密码注册时间
+
+
+ + \ No newline at end of file diff --git a/app-ht/modules/manufacturer/views/manufacturer/index.php b/app-ht/modules/manufacturer/views/manufacturer/index.php index 279c6c0..7630056 100644 --- a/app-ht/modules/manufacturer/views/manufacturer/index.php +++ b/app-ht/modules/manufacturer/views/manufacturer/index.php @@ -33,6 +33,7 @@ $this->params['breadcrumbs'][] = $this->title; ">重    置 + 导出数据    @@ -95,6 +96,16 @@ $this->params['breadcrumbs'][] = $this->title; \ No newline at end of file diff --git a/app-ht/modules/model/controllers/ModelController.php b/app-ht/modules/model/controllers/ModelController.php index ebe80cf..9ac15ba 100644 --- a/app-ht/modules/model/controllers/ModelController.php +++ b/app-ht/modules/model/controllers/ModelController.php @@ -56,7 +56,7 @@ class ModelController extends BaseController $where[] = ['like', 'm.name', $name]; } if ($type == 0) { - $pageList = ModelRepository::getPageList($where); + $pageList = ModelRepository::getPageList($where, 0 , 0); $pages = null; } else { $pageSize = 20; @@ -183,4 +183,13 @@ class ModelController extends BaseController return $this->renderJson($msg); } + /** + * 导出机器型号数据 + * @return string + */ + public function actionExport() + { + $params = $this->dataList(0); + return $this->renderPartial('export', $params); + } } \ No newline at end of file diff --git a/app-ht/modules/model/views/model/export.php b/app-ht/modules/model/views/model/export.php new file mode 100644 index 0000000..e96d663 --- /dev/null +++ b/app-ht/modules/model/views/model/export.php @@ -0,0 +1,58 @@ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
编号机器型号创建时间
+
+
+ + \ No newline at end of file diff --git a/app-ht/modules/model/views/model/index.php b/app-ht/modules/model/views/model/index.php index 892a805..d5badd4 100644 --- a/app-ht/modules/model/views/model/index.php +++ b/app-ht/modules/model/views/model/index.php @@ -32,6 +32,7 @@ $this->params['breadcrumbs'][] = $this->title; ">重    置 + 导出数据    @@ -89,6 +90,16 @@ $this->params['breadcrumbs'][] = $this->title; \ No newline at end of file diff --git a/app-ht/modules/production/controllers/ProductionController.php b/app-ht/modules/production/controllers/ProductionController.php index 5cd56d0..765b6a1 100644 --- a/app-ht/modules/production/controllers/ProductionController.php +++ b/app-ht/modules/production/controllers/ProductionController.php @@ -63,7 +63,7 @@ class ProductionController extends BaseController $where[] = ['<=', 'p.name', $productionEndTime]; } if ($type == 0) { - $pageList = ProductionRepository::getPageList($where); + $pageList = ProductionRepository::getPageList($where, 0 , 0); $pages = null; } else { $pageSize = 20; @@ -190,4 +190,13 @@ class ProductionController extends BaseController return $this->renderJson($msg); } + /** + * 导出厂商数据 + * @return string + */ + public function actionExport() + { + $params = $this->dataList(0); + return $this->renderPartial('export', $params); + } } \ No newline at end of file diff --git a/app-ht/modules/production/views/production/export.php b/app-ht/modules/production/views/production/export.php new file mode 100644 index 0000000..6a72055 --- /dev/null +++ b/app-ht/modules/production/views/production/export.php @@ -0,0 +1,58 @@ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
编号生产日期创建时间
+
+
+ + \ No newline at end of file diff --git a/app-ht/modules/production/views/production/index.php b/app-ht/modules/production/views/production/index.php index cc3604c..3fbc628 100644 --- a/app-ht/modules/production/views/production/index.php +++ b/app-ht/modules/production/views/production/index.php @@ -33,6 +33,7 @@ $this->params['breadcrumbs'][] = $this->title; ">重    置 + 导出数据    @@ -90,6 +91,16 @@ $this->params['breadcrumbs'][] = $this->title; \ No newline at end of file diff --git a/app-ht/modules/project/controllers/ProjectController.php b/app-ht/modules/project/controllers/ProjectController.php index f583a91..d27e1e5 100644 --- a/app-ht/modules/project/controllers/ProjectController.php +++ b/app-ht/modules/project/controllers/ProjectController.php @@ -56,7 +56,7 @@ class ProjectController extends BaseController $where[] = ['like', 'p.name', $name]; } if ($type == 0) { - $pageList = ProjectRepository::getPageList($where); + $pageList = ProjectRepository::getPageList($where, 0, 0); $pages = null; } else { $pageSize = 20; @@ -183,4 +183,13 @@ class ProjectController extends BaseController return $this->renderJson($msg); } + /** + * 导出厂商数据 + * @return string + */ + public function actionExport() + { + $params = $this->dataList(0); + return $this->renderPartial('export', $params); + } } \ No newline at end of file diff --git a/app-ht/modules/project/views/project/export.php b/app-ht/modules/project/views/project/export.php new file mode 100644 index 0000000..56e5294 --- /dev/null +++ b/app-ht/modules/project/views/project/export.php @@ -0,0 +1,58 @@ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
编号项目名称创建时间
+
+
+ + \ No newline at end of file diff --git a/app-ht/modules/project/views/project/index.php b/app-ht/modules/project/views/project/index.php index 73e7d85..8cf92ed 100644 --- a/app-ht/modules/project/views/project/index.php +++ b/app-ht/modules/project/views/project/index.php @@ -32,6 +32,7 @@ $this->params['breadcrumbs'][] = $this->title; ">重    置 + 导出数据    @@ -89,6 +90,16 @@ $this->params['breadcrumbs'][] = $this->title; \ No newline at end of file -- libgit2 0.21.0