Merge branch 'dev-chaxun' into test

src/views/components/resiTransfer.vue

@@ -166,7 +166,7 @@ export default {
         value: 'agencyId',
         label: 'agencyName',
         children: 'subAgencyList',
-        checkStrictly: true
+        // checkStrictly: true
       },
 
       selGrid: {},
@@ -227,8 +227,10 @@ export default {
         ++this.iscascaderShow
         this.casOptions = []
         this.agencyIdArray.length = []
-        // this.tableParams.agencyId = ''
+
         if (data) {
+          let treeData = [data]
+          this.resolveAgencyTree(treeData)
           this.casOptions.push(data)
         }
 
@@ -237,6 +239,22 @@ export default {
       }
     },
 
+    resolveAgencyTree (treeData) {
+      treeData.forEach(element => {
+        if (!element.subAgencyList || element.subAgencyList.length === 0) {//不存在下级，且level=grid的是true
+
+          if (element.level === 'grid') {
+            element.disabled = false
+          } else {
+            element.disabled = true
+          }
+
+        } else {
+          this.resolveAgencyTree(element.subAgencyList)
+        }
+      });
+    },
+
     handleChangeAgency () {
       console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
       this.selGrid = this.$refs["myCascader"].getCheckedNodes()[0].data

src/views/modules/communityParty/regionalParty/finishList.vue

@@ -119,16 +119,17 @@
                          header-align="center"
                          align="center"
                          label="评分（百分制）"
-                         min-width="150">
+                         min-width="120">
           <template slot-scope="scope">
             <div v-if="scope.row.isEdit">
-              <el-input class="item_width_2"
+              <!-- <el-input class="item_width_2"
-                        v-model.trim="scope.row.score"></el-input>
+                        v-model.number="scope.row.score" 
-              <!-- <el-input-number class="item_width_1"
+              onkeyup="this.value = this.value.replace(/[^\d.]/g,'');"></el-input>-->
+              <el-input-number class="item_width_1"
                                v-model="scope.row.score"
                                :precision="1"
-                               :step="0.1"
+                               :controls="false"
-                               :max="100"></el-input-number> -->
+                               :max="100"></el-input-number>
             </div>
             <span v-else>{{scope.row.score}}</span>
           </template>
@@ -340,7 +341,7 @@ export default {
         timeShow: '',
         status: '',
         unitId: '',
-        score: null
+        score: undefined
       }
       this.tableData.push(obj)
     },
@@ -430,6 +431,9 @@ export default {
       if (row.score !== 0 && !row.score) {
         message = message + '评分不能为空；'
       }
+      if (row.score > 100) {
+        message = message + '评分不能超过100分；'
+      }
       return message
     },
 

src/views/modules/communityParty/regionalParty/units.vue

@@ -171,6 +171,12 @@
                          label="群众满意度"
                          width="100">
         </el-table-column>
+        <el-table-column prop="score"
+                         header-align="center"
+                         align="center"
+                         label="积分"
+                         width="80">
+        </el-table-column>
         <el-table-column prop="remark"
                          header-align="center"
                          align="center"