提交9.13,下午未完成修改业主添加

app/admin/controller/Proprietor.php

@@ -200,21 +200,21 @@ class Proprietor extends BaseController
 
             if($permission == 0){
                 //业主部门找在他委托下的
-                $where_d[] =["entrust_unit", "=", $unit_name];
+                //$where_d[] =["entrust_unit", "=", $unit_name];
+                $where_d[]=["unit_name","=",get_login_admin('unit_name')];
                 $where_g[] = [
-                    ['title', '=', "业主"],
+                    ["pid","=",Db::name("admin_group")->where( 'title',  "业主")->value("id")],
                 ];
             }
 
             $department = Db::name('Department')
                     ->where('status', '>=', 0)//正常
                     ->where($where_d)
-                    ->select()
-                    ->toArray();
-            $department = set_recursion($department);
+                    ->find();
+
 
             $group = Db::name('AdminGroup')
-                    ->where($where_g)
+                    ->whereOr($where_g)
                     ->select()->toarray();
 
 			if ($id > 0) {//编辑时

app/admin/controller/project/Cost.php

@@ -762,14 +762,13 @@ class Cost extends BaseController
         // halt($param);
         $type = isset($param['type']) ? $param['type'] : 0;
         if (request()->isAjax()) {
-//            halt($param);
-            if ($type == 2) {
 
-                $id = isset($param['id']) ? $param['id'] : 0;
-                $detail = $this->model->getCostProjectById($id);
+               $id = isset($param['id']) ? $param['id'] : 0;
+               $detail = $this->model->getCostProjectById($id);
 
+            if ($type == 2) {
 
-                $review_unit_name = Db::name('department')->where(['id' => $detail["review_unit"]])->value('title');
+                $review_unit_name = Db::name('department')->where(['id' => $param["review_unit"]])->value('title');
                 $unit_name = Db::name('admin')->where('id', $this->uid)->value('unit_name');
 
                 $person = Db::name("admin")->where([["unit_name", "=", $unit_name], ["status", "=", 1]])->field(["id", "nickname"])->select()->toArray();
@@ -787,8 +786,8 @@ class Cost extends BaseController
                 $proprietor =Db::name("admin")->where($where)->field(["id","nickname"])->select()->toArray();
 
 
-                $review_person = Db::name("admin")->where([["unit_name", "=", $detail["review_unit"]], ["status", "=", 1]])->field(["id", "nickname"])->select();
-                $review_name = Db::name("admin")->where("id", $detail['review_head'])->field(["id", "nickname"])->find();
+                $review_person = Db::name("admin")->where([["unit_name", "=", $param["review_unit"]], ["status", "=", 1]])->field(["id", "nickname"])->select();
+                $review_name = Db::name("admin")->where("id",$param['review_head'])->field(["id", "nickname"])->find();
                 $audit = Db::name("project_audit")->where([["project_id", "=", $id], ["sponsor_id", "=", $this->uid]])->order('create_time', 'desc')->select();
                 $file_array = Db::name('ProjectFile')
                     ->field('mf.id,mf.topic_id,mf.admin_id,f.name,f.filesize,f.filepath,f.fileext,f.create_time,f.admin_id,a.nickname as admin_name')
@@ -854,13 +853,24 @@ class Cost extends BaseController
             if(($param["entrust_second_approver"])&&!empty($param["entrust_second_approver"])){
                 $param["entrust_second_approver_name"] = get_admin($param["entrust_second_approver"])["nickname"];
             }
+
+
             //送审
-            if(($param["sent_review_head"])&&!empty($param["sent_review_head"])){
+            if(isset($param["sent_review_head"])&&$detail["proprietor_status"]==0){
                 $param["sent_review_head_name"] = get_admin($param["sent_review_head"])["nickname"];
                 $param["sent_review_unit"]=get_admin($param["sent_review_head"])["unit_name"];
                 $param["sent_review_unit_name"]=Db::name("department")->where("id",$param["sent_review_unit"])->value("title");
                 $param["sent_review_phone"] = get_admin($param["sent_review_head"])["mobile"];//电话
             }
+
+            if(isset($deatil["sent_review_head"])&&$detail["proprietor_status"]==3){//业主创建推送时
+                $param["sent_review_head_name"] = get_admin($detail["sent_review_head"])["nickname"];
+                $param["sent_review_unit"]=get_admin($detail["sent_review_head"])["unit_name"];
+                $param["sent_review_unit_name"]=Db::name("department")->where("id",$detail["sent_review_unit"])->value("title");
+                $param["sent_review_phone"] = get_admin($detail["sent_review_head"])["mobile"];//电话
+            }
+
+
             $field_name = array_keys($this->field_name);
             $ab = $this->model->where("id", $param["id"])->field($field_name)->find()->toArray();
             $ab["project_start_time"] = date('Y-m-d', $ab["project_start_time"]);

app/admin/view/Proprietor/add.html

@@ -50,12 +50,9 @@
 		<tr>
 			<td class="layui-td-gray">所在部门<font>*</font></td>
 			<td>
-				<select name="did" lay-verify="required" lay-reqText="请选择所属部门">
-					<option value="">请选择所属部门</option>
-					{volist name="department" id="v"}
-						<option value="{$v.id}">{$v.title}</option>
-					{/volist}
-				</select>
+				<input type="text" name="department" value="{$department.title}" autocomplete="off" class="layui-input" disabled>
+				<input type="hidden" name="" value="{$department.id}" autocomplete="off" class="layui-input" disabled>
+
 			</td>
 
 			<td class="layui-td-gray">是否为该部门负责人<font>*</font></td>

app/admin/view/department/add.html

@@ -3,7 +3,7 @@
 
 <!-- 主体 -->
 {block name="body"}
-<form class="layui-form p-4">
+<form class="layui-form p-4" lay-filter="val-filter">
 	<h3 class="pb-3">部门架构</h3>
 	{eq name="$id" value="0"}
 	<table class="layui-table">
@@ -26,7 +26,7 @@
 		{if $permission == 1}
 		<tr>
 			<td class="layui-td-gray">单位类型：<font>*</font></td>
-			<td>
+			<td id="radio_type">
 				<input type="radio" name="type" value="-1" title="系统方" checked>
 				<input type="radio" name="type" value="0" title="财政局">
 				<input type="radio" name="type" value="1" title="业主">
@@ -35,7 +35,7 @@
 		</tr>
 		{/if}
 
-		<tr class ="entrust-unit-row">
+		<tr class ="entrust-unit-row" id="entrust_show" style="display: none">
 			<td class="layui-td-gray-2 get-entrust">委托单位</td>
 			<td colspan="3">
 				<input type="text" name="entrust_unit_name" placeholder="请选择委托单位(仅业主选择)" autocomplete="off" class="layui-input get-entrust">
@@ -71,7 +71,7 @@
 		</tr>
 
 		{if $permission == 1}
-		<tr>
+		<tr id="radio_type_edit">
 			<td class="layui-td-gray">单位类型：<font>*</font></td>
 			<td>
 				<input type="radio" name="type" value="-1" title="系统方" {eq name="$d_type" value="-1" }checked{/eq}>
@@ -82,7 +82,7 @@
 		</tr>
 		{/if}
 
-		<tr class ="entrust-unit-row">
+ 		<tr class ="entrust-unit-row"  id="entrust_show_edit" style="display: none">
 			<td class="layui-td-gray-2 get-entrust">委托单位</td>
 			<td colspan="3">
 				<input type="text" name="entrust_unit_name" placeholder="请选择委托单位(仅业主选择)" autocomplete="off" class="layui-input get-entrust" value="{$entrust_unit_name}">
@@ -153,29 +153,44 @@
 			}
 			oaTool.getEntrust(callback);
 		});
-		//
-		// $(document).on('change', 'input[name="type"]', function () {
-		// 	console.log("执行变化");
-		// 	if ($(this).val() === '1') {
-		// 		$('.entrust-unit-row').show();
-		// 	} else {
-		// 		$('.entrust-unit-row').hide();
-		// 	}
-		// });
 
+
+		$(document).on('click', '#radio_type', function () {
+
+ 			var data = form.val('val-filter');
+			if(data.type == 1){
+				// entrust_show
+				$("#entrust_show").show()
+			}else{
+				$("#entrust_show").hide()
+			}
+
+		});
+
+		$(document).on('click', '#radio_type_edit', function () {
+			// console.log(123123)
+ 			var data = form.val('val-filter');
+			console.log(data.type)
+			if(data.type == 1){
+				// entrust_show
+				$("#entrust_show_edit").show()
+			}else{
+				$("#entrust_show_edit").hide()
+			}
+
+		});
 		//页面加载时根据初始选中的单选按钮值设置委托单位行的显示状态
-		// $(document).ready(function () {
-		// 	console.log("执行了");
-		// 	$('input[name="type"]').each(function() {
-		// 		if ($(this).is(':checked')) {
-		// 			if ($(this).val() === '1') {
-		// 				$('.entrust-unit-row').show();
-		// 			} else {
-		// 				$('.entrust-unit-row').hide();
-		// 			}
-		// 		}
-		// 	});
-		// });
+		$(document).ready(function () {
+			$('input[name="type"]').each(function() {
+				if ($(this).is(':checked')) {
+					if ($(this).val() === '1') {
+						$('.entrust-unit-row').show();
+					} else {
+						$('.entrust-unit-row').hide();
+					}
+				}
+			});
+		});
 	}
 </script>
 {/block}

app/admin/view/project/cost/edit_first.html

@@ -427,7 +427,8 @@
       </th>
       {/if}
 
-      {if $field.project_time == 1  }
+<!--      财评直接创建时-->
+      {if $field.project_time == 1 }
       <th class="form-title">项目周期 <font style="color: red !important;">*</font></th>
       <th id="date" colspan="2">
         <div class="layui-input-inline" style="width: 47%;">