Merge branch 'nan' of sckj/mz-cloud into master

ruoyi-ui/src/views/search/xxtj/lnrtj/yljg/index.vue

@@ -205,6 +205,14 @@ export default {
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)
         this.formData[this.formDataidx] = data[0];
+	      // 临时添加
+	      if (this.formDataidx === 1 || this.formDataidx === 2 || this.formDataidx === 3) {
+		      this.formData[this.formDataidx].keys.push({ label: '特困', prop: 'data10', type: 'select', width: '' })
+
+		      this.formData[this.formDataidx].vales.forEach((item,index) => {
+			      item.data10 = index
+		      });
+	      }
       }
     }
   },

ruoyi-ui/src/views/search/xxtj/sqylfwjghsstj/index.vue

@@ -267,9 +267,26 @@ export default {
       this.loading = true
       let retdata = await getstatisticaldata(this.queryParams)
       this.loading = false
-      if (retdata.code == 200) {
-        var data = this.$DBRetToObjA(retdata.data)
-        this.formData[this.formDataidx] = data[0];
+	    if (retdata.code == 200) {
+		    var data = this.$DBRetToObjA(retdata.data);
+		    this.formData[this.formDataidx] = data[0];
+		    // 临时添加
+		    if (this.formDataidx === 1 || this.formDataidx === 2 || this.formDataidx === 3) {
+			    let arr1 = this.formData[this.formDataidx].keys.slice(0, 3)
+				    , arr3 = this.formData[this.formDataidx].keys.slice(3)
+				    , arr2 = [
+				    { label: '全托服务社区养老服务机构和设施', prop: 'data5', type: 'select', width: '' },
+				    { label: '日间照料社区养老服务机构和设施', prop: 'data6', type: 'select', width: '' },
+				    { label: '互助型社区养老服务设施', prop: 'data7', type: 'select', width: '' },
+				    { label: '其他社区养老服务设施', prop: 'data8', type: 'select', width: '' },
+			    ];
+			    arr1[2].label = '社区养老服务机构和设施总数';
+			    this.formData[this.formDataidx].keys = [...arr1, ...arr2, ...arr3];
+
+			    this.formData[this.formDataidx].vales.forEach((item) => {
+				    Object.assign(item, { data5: '5', data6: '6', data7: '7', data8: '8' });
+			    });
+	      }
       }
     }
   },

ruoyi-ui/src/views/search/xxtj/yljgtj/index.vue

@@ -347,6 +347,10 @@ export default {
       if (retdata.code == 200) {
         var data = this.$DBRetToObjA(retdata.data)
         this.formData[this.formDataidx] = data[0];
+				// 临时添加
+				if(this.formDataidx === 19 || this.formDataidx === 20){
+					this.formData[this.formDataidx].keys = this.formData[this.formDataidx].keys.slice(0,11)
+				}
         this.keys();
       }
     }