From 4c6d6e77321dcc52bdea2f40c596483e791da4ee Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 28 Jan 2022 15:04:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sass/AppSpecialPeople/add.vue    | 87 +++++++++++++++-------------
 src/sass/AppSpecialPeople/detail.vue | 50 +++++++++-------
 2 files changed, 77 insertions(+), 60 deletions(-)

diff --git a/src/sass/AppSpecialPeople/add.vue b/src/sass/AppSpecialPeople/add.vue
index 94ebecab..6677e3b1 100644
--- a/src/sass/AppSpecialPeople/add.vue
+++ b/src/sass/AppSpecialPeople/add.vue
@@ -130,6 +130,39 @@ export default {
       selectName: '',
       tableIndex: 0,
       tableData: [
+        {
+          list: [   // 残疾人
+            {
+              label: '家庭年收入（万）',
+              type: 'input',
+              formDbName: 'income'
+            },
+            {
+              label: '婚姻情况',
+              type: 'select',
+              dict: 'appSpecialMarriage',
+              formDbName: 'marriage'
+            },
+            {
+              label: '身体状况',
+              type: 'select',
+              dict: 'appSpecialHealth',
+              formDbName: 'health'
+            },
+            {
+              label: '残疾类型',
+              type: 'select',
+              dict: 'appSpecialDisableType',
+              formDbName: 'type'
+            },
+            {
+              label: '残疾级别',
+              type: 'select',
+              dict: 'appSpecialDisableLevel',
+              formDbName: 'level'
+            },
+          ]
+        },
         {
           list: [  // 精神病人
             {
@@ -166,39 +199,6 @@ export default {
             },
           ]
         },
-        {
-          list: [   // 残疾人
-            {
-              label: '家庭年收入（万）',
-              type: 'input',
-              formDbName: 'income'
-            },
-            {
-              label: '婚姻情况',
-              type: 'select',
-              dict: 'appSpecialMarriage',
-              formDbName: 'marriage'
-            },
-            {
-              label: '身体状况',
-              type: 'select',
-              dict: 'appSpecialHealth',
-              formDbName: 'health'
-            },
-            {
-              label: '残疾类型',
-              type: 'select',
-              dict: 'appSpecialDisableType',
-              formDbName: 'type'
-            },
-            {
-              label: '残疾级别',
-              type: 'select',
-              dict: 'appSpecialDisableLevel',
-              formDbName: 'level'
-            },
-          ]
-        },
         {
           list: [  // 社区矫正人群
             {
@@ -345,7 +345,8 @@ export default {
     this.$dict.load('appSpecialSituation', 'appSpecialPlacement', 'appSpecialDenger', 'appSpecialCrime',
         'appSpecialControl', 'appSpecialDebug', 'appSpecialDrug', 'appSpecialChangeType','appSpecialCure','appSpecialDengerLevel',
         'appSpecialDisableLevel','appSpecialDisableType','appSpecialHealth','appSpecialMarriage','appSpecialTypeFive').then(() => {
-    })
+    }),
+    this.gridName()
   },
   onShow() {
     document.title = '新增人员'
@@ -363,10 +364,18 @@ export default {
             return this.$u.toast('请输入正确的身份证号码')
           }
       }
-      
     },
+
+    gridName() {
+      this.$http.post('app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser').then(res => {
+        console.log(res);
+        // if(res.code == 0 ){
+        // }
+      })
+    },
+
     submit() {
-      if(this.userType === ''){
+      if(this.form.userType === ''){
         return this.$u.toast('请选择类型')
       }
       if(!this.form.name){
@@ -388,10 +397,10 @@ export default {
         return this.$u.toast('请选择网格')
       }
 
-      var urlList = ['app/appspecialmental/addOrUpdate', 'app/appspecialdisabled/addOrUpdate', 'app/appspecialdisabled/addOrUpdate',
-       'app/appspecialdisabled/addOrUpdate', 'app/appspecialdisabled/addOrUpdate']
+      var urlList = ['app/appspecialdisabled/addOrUpdate','app/appspecialmental/addOrUpdate',  'app/appspecialadjustment/addOrUpdate',
+       'app/appspecialdrug/addOrUpdate', 'app/appspecialprison/addOrUpdate']
 
-      this.$http.post(urlList[this.form.userType], this.form).then(res => {
+      this.$http.post(urlList[this.form.userType], {...this.form}).then(res => {
         if(res.code == 0) {
           this.$u.toast('提交成功')
           uni.$emit('specialPeopleList')
diff --git a/src/sass/AppSpecialPeople/detail.vue b/src/sass/AppSpecialPeople/detail.vue
index f6143165..792feaed 100644
--- a/src/sass/AppSpecialPeople/detail.vue
+++ b/src/sass/AppSpecialPeople/detail.vue
@@ -26,7 +26,10 @@
       <div class="title">特殊人群</div>
       <div class="num-content">
         <div class="num-item" v-for="(item, index) in statisticsList" :key="index">
-          <h3>{{item.value}}</h3>
+          <h3>
+            <!-- {{item.value}} -->
+            {{ $dict.getLabel('appSpecialTypeFive', item.value) }}
+          </h3>
           <p>{{item.label}}</p>
         </div>
         <AiEmpty v-if="!statisticsList.length"/>
@@ -123,7 +126,7 @@ export default {
     },
     getStatistic() {
       this.statisticsList = []
-      this.$http.post(`/app/appspecialadjustment/statistic?type=0&range=0`).then((res) => {
+      this.$http.post(`app/appspecialadjustment/statistic?type=0&range=0`).then((res) => {
         // if (res.code == 0) {
         //   for(let i in res.data){
         //     var obj = {
@@ -151,17 +154,17 @@ export default {
     },
     getUserList() {
       this.userList = []
-      this.$http.post(`/app/appspecialadjustment/allList?type=0&name=${this.name}`).then((res) => {
-        // if (res.code == 0) {
-        //   for(let i in res.data){
-        //     var obj = {
-        //       label: i,
-        //       value: res.data[i],
-        //       check: false
-        //     }
-        //     this.userList.push(obj)
-        //   }
-        // }
+      this.$http.post('app/appspecialadjustment/allList',{type: '', name: this.name}).then((res) => {
+        if (res.code == 0) {
+          for(let i in res.data){
+            var obj = {
+              label: i,
+              value: res.data[i],
+              check: false
+            }
+            this.userList.push(obj)
+          }
+        }
       })
     },
     toAdd() {
@@ -190,17 +193,22 @@ export default {
 
     },
     toEdit(row) {
-      // uni.navigateTo({url: './add'})
+      uni.navigateTo({url: `./add?id=${row.id}`})
     },
     del(row) {
+      var delUrl = ['app/appspecialdisabled/delete','app/appspecialmental/delete',
+      'app/appspecialadjustment/delete','app/appspecialdrug/delete','app/appspecialprison/delete'
+      ]
       this.$confirm('确定删除该数据?').then(() => {
-        // this.$http.post(`/app/appzyvideobroadcast/getBroadcastRecall?broadcastId=${id}`).then((res) => {
-        //   if (res.code == 0) {
-        //     this.$u.toast('撤回成功！')
-        //     this.getList()
-        //   }
-        // })
-      })
+        uni.showLoading()
+        this.$http.post(delUrl[row.userType],{id: row.id}).then((res) => {
+          if (res.code == 0) {
+            this.$u.toast('删除成功！')
+            this.getUserList()
+          }
+          uni.hideLoading()
+        })
+      }).catch(() => {})
     }
   }
 }