From a6fd1e14f825a456579f2fb9eb6484b3892dfbb0 Mon Sep 17 00:00:00 2001 From: monanxiao Date: Thu, 2 Mar 2023 13:37:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8E=E5=8F=B0=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E6=A1=86=E6=9E=B6=EF=BC=8C=E6=9C=AA=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/supplychain/Index.php | 96 +++++++++- app/admin/model/Merchant.php | 32 ++++ app/admin/model/SupplyChain.php | 29 +++ app/admin/model/SupplyChainLinkMerchant.php | 38 ++++ app/admin/view/supplychain/index/add.html | 150 +++++++++++++++ app/admin/view/supplychain/index/edit.html | 133 +++++++++++++ app/admin/view/supplychain/index/index.html | 174 ++++++++++++++++++ app/admin/view/supplychain/index/read.html | 67 +++++++ app/admin/view/supplychain/merchant/add.html | 138 ++++++++++++++ app/admin/view/supplychain/merchant/edit.html | 133 +++++++++++++ .../view/supplychain/merchant/index.html | 174 ++++++++++++++++++ app/admin/view/supplychain/merchant/read.html | 67 +++++++ 12 files changed, 1228 insertions(+), 3 deletions(-) create mode 100644 app/admin/model/Merchant.php create mode 100644 app/admin/model/SupplyChain.php create mode 100644 app/admin/model/SupplyChainLinkMerchant.php create mode 100644 app/admin/view/supplychain/index/add.html create mode 100644 app/admin/view/supplychain/index/edit.html create mode 100644 app/admin/view/supplychain/index/read.html create mode 100644 app/admin/view/supplychain/merchant/add.html create mode 100644 app/admin/view/supplychain/merchant/edit.html create mode 100644 app/admin/view/supplychain/merchant/read.html diff --git a/app/admin/controller/supplychain/Index.php b/app/admin/controller/supplychain/Index.php index 236838e..f2a78b6 100644 --- a/app/admin/controller/supplychain/Index.php +++ b/app/admin/controller/supplychain/Index.php @@ -9,12 +9,24 @@ namespace app\admin\controller\supplychain; use app\admin\BaseController; use think\facade\Db; use think\facade\View; +use app\admin\model\Merchant; // 商户模型 +use app\api\model\Area as AreaModel; // 市场区域模型 +use app\api\model\AreaManager as AreaManagerModel; // 区域负责人模型 class Index extends BaseController { public function __construct() { $this->adminInfo = get_login_admin(); + $this->category_id=354; + $this->url=[ + '/admin/supplychain.index/index?category_id='.$this->category_id, + '/admin/supplychain.index/add', + '/admin/supplychain.index/edit', + '/admin/supplychain.index/delete', + '/admin/supplychain.merchant/index', + '/admin/supplychain.merchant/bill', + ]; } /** @@ -22,9 +34,53 @@ class Index extends BaseController * 供应链团队列表 * */ - public function Index() + public function index() { - return view(); + if (request()->isAjax()) { + + $params= get_params(); + + $where[]= ['status','=',0]; + + if (isset($params['keywords']) && !empty($params['keywords'])){ + $where[]= ['name','like','%'.$params['keywords'].'%']; + } + if($this->adminInfo['position_id'] != 1){ //不是超级管理员 + $www['admin_id'] = $this->adminInfo['id']; + $user_address = Db::table('fa_szxc_information_useraddress')->where($www)->find(); + if ($user_address){ + if($user_address['auth_range'] == 1){ + $where[] = ['village_id','=',$user_address['village_id']]; + }elseif ($user_address['auth_range'] == 2){ + $where[] = ['street_id','=',$user_address['street_id']]; + }elseif ($user_address['auth_range'] == 3){ + $where[] = ['area_id','=',$user_address['area_id']]; + }else{ + $where[] = ['village_id','=',$user_address['village_id']]; + } + }else{ + $where[] = ['village_id','=','']; + } + } + + $total = AreaManagerModel::where($where)->count(); + + // 负责人信息 + $list = AreaManagerModel::with('area') + ->where($where) + ->page($params['page']) + ->limit($params['limit']) + ->order('id desc') + ->select(); + + $result = ['total' => $total, 'data' => $list]; + + return table_assign(0, '', $result); + + }else{ + + return view('nk/areamanager/index',['url'=>$this->url]); + } } /** @@ -34,7 +90,41 @@ class Index extends BaseController */ public function add() { - return view(); + if (request()->isAjax()) { + + $params= get_params(); + + $data['user_id'] = $this->adminInfo['id']; // 操作用户ID + $data['avatar'] = $params['avatar']; // 头像 + $data['name'] = $params['name']; // 姓名 + $data['duty'] = $params['duty']; // 职务 + $data['phone'] = $params['phone']; // 手机号 + $data['area_id'] = $params['area_id']; // 区域ID + + $area = AreaModel::find($params['area_id']); + $data['farm_product_market_id'] = $area->id; // 市场ID + + $data['created_at'] = date('Y-m-d H:i:s'); + $res = AreaManagerModel::create($data); + + if ($res){ + return to_assign(0,'操作成功',['aid'=>$res]); + } + + return to_assign(1, '操作失败,原因:'.$res); + + }else{ + + $area = AreaModel::where('status', 0)->column('id, area_name'); + + // 取出正常的商家 + $merchant = Merchant::where('status', 1)->column('mer_id, real_name'); + + View::assign('editor', get_system_config('other','editor')); + View::assign('area', $area); + View::assign('merchant', $merchant); + return view(); + } } /** diff --git a/app/admin/model/Merchant.php b/app/admin/model/Merchant.php new file mode 100644 index 0000000..0c56b58 --- /dev/null +++ b/app/admin/model/Merchant.php @@ -0,0 +1,32 @@ +hasOneThrough(SupplyChainLinkMerchant::class, SupplyChain::class); + } + + + } \ No newline at end of file diff --git a/app/admin/model/SupplyChain.php b/app/admin/model/SupplyChain.php new file mode 100644 index 0000000..87b0314 --- /dev/null +++ b/app/admin/model/SupplyChain.php @@ -0,0 +1,29 @@ +hasManyThrough(SupplyChainLinkMerchant::class, Merchant::class); + } + + + } \ No newline at end of file diff --git a/app/admin/model/SupplyChainLinkMerchant.php b/app/admin/model/SupplyChainLinkMerchant.php new file mode 100644 index 0000000..2c8e6af --- /dev/null +++ b/app/admin/model/SupplyChainLinkMerchant.php @@ -0,0 +1,38 @@ +hasOne(SupplyChain::class); + } + + /** + * + * 所属商户 + * 一对一 + * + */ + public function merchant() + { + return $this->hasOne(); + } + } \ No newline at end of file diff --git a/app/admin/view/supplychain/index/add.html b/app/admin/view/supplychain/index/add.html new file mode 100644 index 0000000..2b80b87 --- /dev/null +++ b/app/admin/view/supplychain/index/add.html @@ -0,0 +1,150 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

关联商户

+ + + + + + + + + + + + + + + + + + + + + +
选择商户* +
+ +
+
+
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+ + +
+ +
+{/block} + + + +{block name="script"} + + + + + + +{/block} + \ No newline at end of file diff --git a/app/admin/view/supplychain/index/edit.html b/app/admin/view/supplychain/index/edit.html new file mode 100644 index 0000000..a27228d --- /dev/null +++ b/app/admin/view/supplychain/index/edit.html @@ -0,0 +1,133 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

编辑

+ + + + + + + + + + + + + + + + + + +
所属区域* +
+ +
+
姓名* + + 负责人头像 +
+ +
+ + +
+
+
职务* + + 电话* + +
+
+ + + +
+
+{/block} + + + +{block name="script"} + + + +{/block} + \ No newline at end of file diff --git a/app/admin/view/supplychain/index/index.html b/app/admin/view/supplychain/index/index.html index e69de29..acad52f 100644 --- a/app/admin/view/supplychain/index/index.html +++ b/app/admin/view/supplychain/index/index.html @@ -0,0 +1,174 @@ +{extend name="common/base"/} + +{block name="body"} + +
+
+
+ +
+ +
+
+
+ + + + + + + + +{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/supplychain/index/read.html b/app/admin/view/supplychain/index/read.html new file mode 100644 index 0000000..3fffad9 --- /dev/null +++ b/app/admin/view/supplychain/index/read.html @@ -0,0 +1,67 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

详情

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
标题*
简介* + +
内容 + +
坐标 +

经度:{$detail.lng}

+

纬度:{$detail.lat}

+ +
运输距离 + {volist name='farmers' id='vo'} +

距离 {$vo.title} {$vo.juli} 公里

+ {/volist} +
+
+{/block} + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/supplychain/merchant/add.html b/app/admin/view/supplychain/merchant/add.html new file mode 100644 index 0000000..a408038 --- /dev/null +++ b/app/admin/view/supplychain/merchant/add.html @@ -0,0 +1,138 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

添加

+ + + + + + + + + + + + + + + + + + + +
所属区域* +
+ +
+
姓名* + + 负责人头像 +
+ +
+ + +
+
+
职务* + + 电话* + +
+
+ + +
+ +
+{/block} + + + +{block name="script"} + + + + +{/block} + \ No newline at end of file diff --git a/app/admin/view/supplychain/merchant/edit.html b/app/admin/view/supplychain/merchant/edit.html new file mode 100644 index 0000000..a27228d --- /dev/null +++ b/app/admin/view/supplychain/merchant/edit.html @@ -0,0 +1,133 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

编辑

+ + + + + + + + + + + + + + + + + + +
所属区域* +
+ +
+
姓名* + + 负责人头像 +
+ +
+ + +
+
+
职务* + + 电话* + +
+
+ + + +
+
+{/block} + + + +{block name="script"} + + + +{/block} + \ No newline at end of file diff --git a/app/admin/view/supplychain/merchant/index.html b/app/admin/view/supplychain/merchant/index.html index e69de29..acad52f 100644 --- a/app/admin/view/supplychain/merchant/index.html +++ b/app/admin/view/supplychain/merchant/index.html @@ -0,0 +1,174 @@ +{extend name="common/base"/} + +{block name="body"} + +
+
+
+ +
+ +
+
+
+ + + + + + + + +{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/supplychain/merchant/read.html b/app/admin/view/supplychain/merchant/read.html new file mode 100644 index 0000000..3fffad9 --- /dev/null +++ b/app/admin/view/supplychain/merchant/read.html @@ -0,0 +1,67 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

详情

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
标题*
简介* + +
内容 + +
坐标 +

经度:{$detail.lng}

+

纬度:{$detail.lat}

+ +
运输距离 + {volist name='farmers' id='vo'} +

距离 {$vo.title} {$vo.juli} 公里

+ {/volist} +
+
+{/block} + + +{block name="script"} + +{/block} + \ No newline at end of file