17:35

Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs

@@ -14,7 +14,6 @@ namespace Ewide.NbzsZheliban.Entity.Extends
     public class Fhpgs
     {
         public string PrjId { get; set; }
-        public string id { get; set; }
         public string AssessmentNo { get; set; }
         public string HouseAddress { get; set; }
         public string countValue { get; set; }
@@ -22,11 +21,8 @@ namespace Ewide.NbzsZheliban.Entity.Extends
     public class Bcxy
     {
         public string PrjId { get; set; }
-        public string id { get; set; }
         public string XyNo { get; set; }
         public string HouseAddress { get; set; }
-        public string SwitchProductionWay { get; set; }
-        
         public string SummationShouldCompensateMoney { get; set; }
     }
     public class H5IndexModel
@@ -41,7 +37,6 @@ namespace Ewide.NbzsZheliban.Entity.Extends
     public class H5IndexPrjModel
     {
         public string PrjId { get; set; }
-        public string Name { get; set; }
         /// <summary>
         /// 区域
         /// </summary>

Ewide.NbzsZheliban/Service/DataService.cs

@@ -29,9 +29,18 @@ namespace Ewide.NbzsZheliban.Service
             db = repository.Context;
             _jsonSerializer = jsonSerializer;
         }
-        private (string, string) GetUserNameCardNoByTicket(string ticket)
+        /// <summary>
+        /// 被征收人关联的项目列表
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        [HttpPost("/project/list")]
+        [Microsoft.AspNetCore.Authorization.AllowAnonymous]
+        public async Task<dynamic> PrjList([FromBody] JObject args)
         {
             #region 票据
+            var ticket = args.GetJsonValue("ticket", isThrowExp: true);
+            //var ticket = Request.Query["ticket"];
             if (!string.IsNullOrWhiteSpace(ticket))
             {
                 var time = DateTime.Now.ToString("yyyyMMddHHmmss");
@@ -81,25 +90,8 @@ namespace Ewide.NbzsZheliban.Service
                     throw Oops.Oh($"ticket接口返回值有误,[{tickerRsltStr}]");
                 var cardno = userinfoObj["idnum"].ToString();
                 var username = userinfoObj["username"].ToString();
+
                 #endregion
-                return (cardno, username);
-            }
-            return ("", "");
-        }
-        /// <summary>
-        /// 被征收人关联的项目列表
-        /// </summary>
-        /// <param name="args"></param>
-        /// <returns></returns>
-        [HttpPost("/project/list")]
-        [Microsoft.AspNetCore.Authorization.AllowAnonymous]
-        public async Task<dynamic> PrjList([FromBody] JObject args)
-        {
-            var ticket = args.GetJsonValue("ticket", isThrowExp: true);
-            //获取用户身份证号码
-            var (cardno, username) = GetUserNameCardNoByTicket(ticket);
-            if (!string.IsNullOrEmpty(cardno))
-            {
                 //var cardno = args.GetJsonValue("cardno", isThrowExp: true);
                 //住宅调查表
                 var list_zz_dcb = await db.Ado.SqlQueryAsync<Dcbs>("select ID dcbId,ProjectId PrjId from InvestigateTable b where b.ExpropriatedCardNo=@ExpropriatedCardNo", new List<SugarParameter> { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray());
@@ -108,12 +100,13 @@ namespace Ewide.NbzsZheliban.Service
                 //调查表集合
                 var list_dcbs = list_zz_dcb.Concat(list_fzz_dcb);
                 //项目列表
-                var list_projects = await db.Ado.SqlQueryAsync<H5IndexPrjModel>("select a.ID Prjid,a.Name,a.area,a.HouseAcquisitionDepartment as zsbm,a.CollectDecisionNo1 as year,(isnull(a.CollectDecisionNoHeadName,'')+'['+cast(a.CollectDecisionNo1 as varchar)+']'+ isnull(cast(a.CollectDecisionNo2 as varchar),'')+'号') zsjdh,dbo.get_current_state(a.ID) CurrentState from Projects a where ID in ('" + string.Join("','", list_dcbs.Select(p => p.PrjId)) + "') ");
+                var list_projects = await db.Ado.SqlQueryAsync<H5IndexPrjModel>("select a.ID Prjid,a.area,a.HouseAcquisitionDepartment as zsbm,a.CollectDecisionNo1 as year,(isnull(a.CollectDecisionNoHeadName,'')+'['+cast(a.CollectDecisionNo1 as varchar)+']'+ isnull(cast(a.CollectDecisionNo2 as varchar),'')+'号') zsjdh,dbo.get_current_state(a.ID) CurrentState from Projects a where ID in ('" + string.Join("','", list_dcbs.Select(p => p.PrjId)) + "') ");
                 //分户评估
                 var InvestigateTableID_param = "'" + string.Join("','", list_dcbs.Select(p => p.dcbId)) + "'";
-                var list_fhpgs = await db.Ado.SqlQueryAsync<Fhpgs>("select  d.id,e.ProjectId as PrjId ,d.AssessmentNo,e.HouseAddress,d.countValue from InvestigateTable_Assessment d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select e.ProjectId as PrjId ,AssessmentNo, e.HouseAddress, d.countValue from NonInvestigateTable_Assessment d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ) ;");
+                var list_fhpgs = await db.Ado.SqlQueryAsync<Fhpgs>("select   e.ProjectId as PrjId ,d.AssessmentNo,e.HouseAddress,d.countValue from InvestigateTable_Assessment d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select e.ProjectId as PrjId ,AssessmentNo, e.HouseAddress, d.countValue from NonInvestigateTable_Assessment d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ) ;");
                 //补偿协议 
-                var list_bcxys = await db.Ado.SqlQueryAsync<Bcxy>("select d.id,isnull(d.CollectDecisionNoHeadName,'')+isnull(d.No1,'')+'-'+isnull(d.No2,'')+(case when (d.No3 is null or d.No3 = '') then '' else ('-'+d.No3) end ) XyNo,d.SwitchProductionWay,e.HouseAddress,d.SummationShouldCompensateMoney,e.ProjectId as PrjId from ResidentialAgreement d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select isnull(d.CollectDecisionNoHeadName, '') + isnull(d.No2, '') + '-' + isnull(d.No3, '') XyNo , d.SwitchProductionWay, e.HouseAddress, d.SummationShouldCompensateMoney, e.ProjectId as PrjId from NonResidentialAgreement d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ); ");
+                var list_bcxys = await db.Ado.SqlQueryAsync<Bcxy>("select isnull(d.CollectDecisionNoHeadName,'')+isnull(d.No1,'')+'-'+isnull(d.No2,'')+(case when (d.No3 is null or d.No3 = '') then '' else ('-'+d.No3) end ) XyNo,d.SwitchProductionWay,e.HouseAddress,d.SummationShouldCompensateMoney,e.ProjectId as PrjId from ResidentialAgreement d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select isnull(d.CollectDecisionNoHeadName, '') + isnull(d.No2, '') + '-' + isnull(d.No3, '') XyNo , d.SwitchProductionWay, e.HouseAddress, d.SummationShouldCompensateMoney, e.ProjectId as PrjId from NonResidentialAgreement d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ); ");
+
                 list_projects.ForEach(p =>
                 {
                     p.FhpgList = list_fhpgs.Where(a => a.PrjId == p.PrjId);
@@ -152,12 +145,12 @@ namespace Ewide.NbzsZheliban.Service
             //调查表集合
             var list_dcbs = list_zz_dcb.Concat(list_fzz_dcb);
             //项目列表
-            var list_projects = await db.Ado.SqlQueryAsync<H5IndexPrjModel>("select a.ID Prjid,a.Name,a.area,a.HouseAcquisitionDepartment as zsbm,a.CollectDecisionNo1 as year,(isnull(a.CollectDecisionNoHeadName,'')+'['+cast(a.CollectDecisionNo1 as varchar)+']'+ isnull(cast(a.CollectDecisionNo2 as varchar),'')+'号') zsjdh,dbo.get_current_state(a.ID) CurrentState from Projects a where ID in ('" + string.Join("','", list_dcbs.Select(p => p.PrjId)) + "') ");
+            var list_projects = await db.Ado.SqlQueryAsync<H5IndexPrjModel>("select a.ID Prjid,a.area,a.HouseAcquisitionDepartment as zsbm,a.CollectDecisionNo1 as year,(isnull(a.CollectDecisionNoHeadName,'')+'['+cast(a.CollectDecisionNo1 as varchar)+']'+ isnull(cast(a.CollectDecisionNo2 as varchar),'')+'号') zsjdh,dbo.get_current_state(a.ID) CurrentState from Projects a where ID in ('" + string.Join("','", list_dcbs.Select(p => p.PrjId)) + "') ");
             //分户评估
             var InvestigateTableID_param = "'" + string.Join("','", list_dcbs.Select(p => p.dcbId)) + "'";
-            var list_fhpgs = await db.Ado.SqlQueryAsync<Fhpgs>("select  d.id,e.ProjectId as PrjId ,d.AssessmentNo,e.HouseAddress,d.countValue from InvestigateTable_Assessment d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select d.id,e.ProjectId as PrjId ,AssessmentNo, e.HouseAddress, d.countValue from NonInvestigateTable_Assessment d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ) ;");
+            var list_fhpgs = await db.Ado.SqlQueryAsync<Fhpgs>("select   e.ProjectId as PrjId ,d.AssessmentNo,e.HouseAddress,d.countValue from InvestigateTable_Assessment d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select e.ProjectId as PrjId ,AssessmentNo, e.HouseAddress, d.countValue from NonInvestigateTable_Assessment d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ) ;");
             //补偿协议 
-            var list_bcxys = await db.Ado.SqlQueryAsync<Bcxy>("select d.id,isnull(d.CollectDecisionNoHeadName,'')+isnull(d.No1,'')+'-'+isnull(d.No2,'')+(case when (d.No3 is null or d.No3 = '') then '' else ('-'+d.No3) end ) XyNo,d.SwitchProductionWay,e.HouseAddress,d.SummationShouldCompensateMoney,e.ProjectId as PrjId from ResidentialAgreement d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select d.id,isnull(d.CollectDecisionNoHeadName, '') + isnull(d.No2, '') + '-' + isnull(d.No3, '') XyNo , d.SwitchProductionWay, e.HouseAddress, d.SummationShouldCompensateMoney, e.ProjectId as PrjId from NonResidentialAgreement d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ); ");
+            var list_bcxys = await db.Ado.SqlQueryAsync<Bcxy>("select isnull(d.CollectDecisionNoHeadName,'')+isnull(d.No1,'')+'-'+isnull(d.No2,'')+(case when (d.No3 is null or d.No3 = '') then '' else ('-'+d.No3) end ) XyNo,d.SwitchProductionWay,e.HouseAddress,d.SummationShouldCompensateMoney,e.ProjectId as PrjId from ResidentialAgreement d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select isnull(d.CollectDecisionNoHeadName, '') + isnull(d.No2, '') + '-' + isnull(d.No3, '') XyNo , d.SwitchProductionWay, e.HouseAddress, d.SummationShouldCompensateMoney, e.ProjectId as PrjId from NonResidentialAgreement d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ); ");
 
             list_projects.ForEach(p =>
             {

FrontCode2/sunshine_levy/src/elementui/index.js

@@ -1,8 +1,8 @@
-import Vue from 'vue'
+import Vue from "vue";
 
-import { Form, FormItem, Button, Card } from 'element-ui'
+import { Form, FormItem, Button, Card } from "element-ui";
 
-Vue.use(Form)
-Vue.use(FormItem)
-Vue.use(Button)
-Vue.use(Card)
+Vue.use(Form);
+Vue.use(FormItem);
+Vue.use(Button);
+Vue.use(Card);

FrontCode2/sunshine_levy/src/main.js

@@ -1,54 +1,57 @@
 // The Vue build version to load with the `import` command
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
-import './assets/reset.css';
-import 'lib-flexible/flexible';
+// import "./assets/reset.css";
+import "lib-flexible/flexible";
 
-import '@/elementui'
-import ElementUI from 'element-ui'
-import 'element-ui/lib/theme-chalk/index.css'
+import "@/elementui";
+import ElementUI from "element-ui";
+import "element-ui/lib/theme-chalk/index.css";
 
-import Vue from 'vue'
-import App from './App'
-import router from './router'
-import { Button, NavBar, Cell, CellGroup } from 'vant';
+import Vue from "vue";
+import App from "./App";
+import router from "./router";
+import { Button, NavBar, Cell, CellGroup } from "vant";
 
+Vue.use(Button)
+  .use(NavBar)
+  .use(Cell)
+  .use(CellGroup)
+  .use(ElementUI);
 
-Vue.use(Button).use(NavBar).use(Cell).use(CellGroup);
-
-import { Image as VanImage } from 'vant';
+import { Image as VanImage } from "vant";
 
 Vue.use(VanImage);
 
-import { Col, Row } from 'vant';
+import { Col, Row } from "vant";
 
 Vue.use(Col);
 Vue.use(Row);
 
-import { Grid, GridItem } from 'vant';
+import { Grid, GridItem } from "vant";
 
 Vue.use(Grid);
 Vue.use(GridItem);
 
-import { Icon } from 'vant';
+import { Icon } from "vant";
 
 Vue.use(Icon);
 
-import { List } from 'vant';
+import { List } from "vant";
 
 Vue.use(List);
 
-import { Divider } from 'vant';
+import { Divider } from "vant";
 
 Vue.use(Divider);
 
-Vue.config.productionTip = false
-import md5 from 'js-md5'
-Vue.prototype.$md5 = md5
+Vue.config.productionTip = false;
+import md5 from "js-md5";
+Vue.prototype.$md5 = md5;
 /* eslint-disable no-new */
 const vm = new Vue({
-  el: '#app',
+  el: "#app",
   router,
   components: { App },
-  template: '<App/>'
-})
-export default vm
+  template: "<App/>"
+});
+export default vm;

FrontCode2/sunshine_levy/src/views/report/agreement.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="text">为您查询到{{ this.result }}条结果</div>
     <div :key="index" v-for="(item, index) in info">
-      <el-card>
+      <el-card body-style="padding:10px 10px 0">
         <div>
           <img alt src="@/assets/img/bianhao.png" />
           评估报告编号：
@@ -34,7 +34,7 @@
         <div>
           <img alt src="@/assets/img/hengxian.png" />
         </div>
-        <div class="date">
+        <div class="flex">
           <div class="flex backgroundColor">
             <img alt src="@/assets/img/shijian.png" />
             签订日期：{{ item.time }}
@@ -48,25 +48,25 @@
 export default {
   data() {
     return {
-      result: '2',
+      result: "2",
       info: [
         {
-          number: '044',
-          name: '胡守钧',
-          address: '宁波市江北区四洲街16号404',
-          money: '180234元',
-          person: '王勇',
-          time: '2021-9-1',
+          number: "044",
+          name: "胡守钧",
+          address: "宁波市江北区四洲街16号404",
+          money: "180234元",
+          person: "王勇",
+          time: "2021-9-1"
         },
         {
-          number: '044',
-          name: '胡守钧',
-          address: '宁波市江北区四洲街16号404',
-          money: '180234元',
-          person: '王勇',
-          time: '2021-9-1',
-        },
-      ],
+          number: "044",
+          name: "胡守钧",
+          address: "宁波市江北区四洲街16号404",
+          money: "180234元",
+          person: "王勇",
+          time: "2021-9-1"
+        }
+      ]
     };
   },
   created() {
@@ -80,8 +80,8 @@ export default {
     onLoadData() {
       console.log(this.$route.params);
       this.type = this.$route.params.type;
-    },
-  },
+    }
+  }
 };
 </script>
 
@@ -89,37 +89,38 @@ export default {
 .container {
   .image {
     margin-top: 20px;
-
     text-align: center;
   }
   .text {
     font-weight: bolder;
-
     margin: 10px 0;
-
     text-align: center;
-
     color: #2d6df2;
   }
   .el-card {
     margin: 0 10px 10px;
-    ::v-deep.el-card__body {
+    .el-card__body {
       padding: 0 10px;
-      >div {
+      > div {
         margin: 10px 0;
-      }
-      .date {
         display: flex;
-        justify-content: center;
-        .backgroundColor {
-          background-color: #e3ebfd;
-          img {
-            margin-right: 10px;
-          }
+        align-items: center;
+        img {
+          margin-right: 10px;
         }
       }
+      .flex {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        img {
+          margin-right: 10px;
+        }
+      }
+      .backgroundColor {
+        background-color: #e3ebfd;
+      }
     }
   }
 }
-
 </style>

FrontCode2/sunshine_levy/src/views/report/compensate.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="text">为您查询到{{ this.result }}条结果</div>
     <div :key="index" v-for="(item, index) in info">
-      <el-card>
+      <el-card body-style="padding:10px">
         <div>
           <img alt src="@/assets/img/bianhao.png" />
           评估报告编号：
@@ -26,12 +26,12 @@
           评估总金额：
           <b style="color: red">{{ item.money }}</b>
         </div>
-        <div class="flex">
-          <div class="flex backgroundColor">
+        <div class="content">
+          <div class=" backgroundColor">
             <img alt src="@/assets/img/renyuan.png" />
             评估人员：{{ item.person }}
           </div>
-          <div class="flex backgroundColor">
+          <div class="backgroundColor">
             <img alt src="@/assets/img/shijian.png" />
             评估时间：{{ item.time }}
           </div>
@@ -44,25 +44,25 @@
 export default {
   data() {
     return {
-      result: '2',
+      result: "2",
       info: [
         {
-          number: '044',
-          name: '胡守钧',
-          address: '宁波市江北区四洲街16号404',
-          money: '180234元',
-          person: '王勇',
-          time: '2021-9-1',
+          number: "044",
+          name: "胡守钧",
+          address: "宁波市江北区四洲街16号404",
+          money: "180234元",
+          person: "王勇",
+          time: "2021-9-1"
         },
         {
-          number: '044',
-          name: '胡守钧',
-          address: '宁波市江北区四洲街16号404',
-          money: '180234元',
-          person: '王勇',
-          time: '2021-9-1',
-        },
-      ],
+          number: "044",
+          name: "胡守钧",
+          address: "宁波市江北区四洲街16号404",
+          money: "180234元",
+          person: "王勇",
+          time: "2021-9-1"
+        }
+      ]
     };
   },
   created() {
@@ -76,8 +76,8 @@ export default {
     onLoadData() {
       console.log(this.$route.params);
       this.type = this.$route.params.type;
-    },
-  },
+    }
+  }
 };
 </script>
 
@@ -85,33 +85,41 @@ export default {
 .container {
   .image {
     margin-top: 20px;
-
     text-align: center;
   }
   .text {
     font-weight: bolder;
-
     margin: 10px 0;
-
     text-align: center;
-
     color: #2d6df2;
   }
+
   .el-card {
     margin: 0 10px 10px;
-    ::v-deep.el-card__body {
-      padding: 0 10px;
-      >div {
+    .el-card__body {
+      > div {
         margin: 10px 0;
-      }
-      .backgroundColor {
-        background-color: #e3ebfd;
+        display: flex;
+        align-items: center;
         img {
           margin-right: 10px;
         }
       }
+      .content {
+        display: flex;
+        justify-content: space-between;
+        > div {
+          display: flex;
+          align-items: center;
+        }
+        .backgroundColor {
+          background-color: #e3ebfd;
+          img {
+            margin-right: 10px;
+          }
+        }
+      }
     }
   }
 }
-
 </style>