Merge remote-tracking branch 'origin/release/epdc' into release/epdc

src/views/modules/events/appeal-development-list.vue

@@ -140,7 +140,7 @@
               ></el-table-column>
               <el-table-column
                       prop="nickName"
-                      label="提交人"
+                      label="联系人姓名"
                       header-align="center"
                       min-width="200"
                       align="center"
@@ -209,7 +209,7 @@ export default {
         nickName: '',
         mobile: '',
         appealType: 1,
-          evaluationScore:''
+        evaluationScore: ''
 
       },
       addOrUpdateVisible: false,
@@ -241,7 +241,7 @@ export default {
 
   },
   methods: {
-    getPeoList(){
+    getPeoList () {
       console.log(this.dataList)
     },
     dealAction (id) {

src/views/modules/events/appeal-enforce-list.vue

@@ -140,7 +140,7 @@
               ></el-table-column>
               <el-table-column
                       prop="nickName"
-                      label="提交人"
+                      label="联系人姓名"
                       header-align="center"
                       min-width="200"
                       align="center"
@@ -209,7 +209,7 @@ export default {
         nickName: '',
         mobile: '',
         appealType: 2,
-          evaluationScore:''
+        evaluationScore: ''
 
       },
       addOrUpdateVisible: false,
@@ -241,7 +241,7 @@ export default {
 
   },
   methods: {
-    getPeoList(){
+    getPeoList () {
       console.log(this.dataList)
     },
     dealAction (id) {

src/views/modules/events/appeal-peo-list.vue

@@ -140,7 +140,7 @@
               ></el-table-column>
               <el-table-column
                       prop="nickName"
-                      label="提交人"
+                      label="联系人姓名"
                       header-align="center"
                       min-width="200"
                       align="center"
@@ -209,7 +209,7 @@ export default {
         nickName: '',
         mobile: '',
         appealType: 0,
-          evaluationScore:''
+        evaluationScore: ''
 
       },
       addOrUpdateVisible: false,

src/views/modules/events/item-close-list.vue

@@ -35,10 +35,10 @@
                     ></el-input>
                 </el-form-item>
                 <br>
-                <el-form-item label="提交人" prop="itemCode" label-width="100px">
+                <el-form-item label="联系人姓名" prop="itemCode" label-width="100px">
                     <el-input
                             v-model="dataForm.nickName"
-                            placeholder="请输入提交人"
+                            placeholder="请输入联系人姓名"
                             clearable
                             @keyup.native="btKeyUpNickName"
                             style="width:250px;"
@@ -128,7 +128,7 @@
                 ></el-table-column>
                 <el-table-column
                         prop="nickName"
-                        label="提交人"
+                        label="联系人姓名"
                         header-align="center"
                         min-width="200"
                         align="center"
@@ -213,116 +213,116 @@
 </template>
 
 <script>
-    import mixinViewModule from '@/mixins/view-module'
-    import Detail from './item-detail'
+import mixinViewModule from '@/mixins/view-module'
+import Detail from './item-detail'
 
-    export default {
-        mixins: [mixinViewModule],
-        name: 'ItemCloseList',
-        data() {
-            return {
-                mixinViewModuleOptions: {
-                    getDataListURL: '/events/item/page',
-                    getDataListIsPage: true,
-                  exportURL: '/events/item/unexport'
-                },
-                dataForm: {
-                    id: '',
-                    itemState: '5',
-                    startTime: '',
-                    endTime: '',
-                    streetId: '',
-                    communityId: '',
-                    gridId: '',
-                    itemCode: '',
-                    itemContent: '',
-                    nickName: '',
-                    mobile: ''
-                },
-                ids: [],
-                options: [],
-                detailVisible: false,
-                pickerBeginDateBefore: {
-                    disabledDate: (time) => {
-                        let beginDateVal = this.dataForm.endTime;
-                        if (beginDateVal) {
-                            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
-                        }
-                    }
-                    },
-                pickerBeginDateAfter: {
-                    disabledDate: (time) => {
-                        let EndDateVal = this.dataForm.startTime;
-                        if (EndDateVal) {
-                            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
-                        }
-                    }
-                },
-            }
-        },
-        components: {
-            Detail
-        },
-        created: function () {
-            this.getOptions()
-        },
-        watch: {
-            ids: function (val) {
-                if (val.length === 0) {
-                    this.dataForm.streetId = ''
-                    this.dataForm.communityId = ''
-                    this.dataForm.gridId = ''
-                }
-                if (val.length === 1) {
-                    this.dataForm.streetId = this.ids[0]
-                    this.dataForm.communityId = ''
-                    this.dataForm.gridId = ''
-                }
-                if (val.length === 2) {
-                    this.dataForm.streetId = this.ids[0]
-                    this.dataForm.communityId = this.ids[1]
-                    this.dataForm.gridId = ''
-                }
-                if (val.length === 3) {
-                    this.dataForm.streetId = this.ids[0]
-                    this.dataForm.communityId = this.ids[1]
-                    this.dataForm.gridId = this.ids[2]
-                }
-            }
-        },
-        methods: {
-            detailAction(id) {
-                this.$parent.selectComponent = 'ItemCloseDetailView'
-                this.$router.push({path: '/events-item-close', query: {id: id}})
-            },
-            getOptions() {
-                this.$http
-                    .get(`/sys/user/deptOptions/getByLoginUser`)
-                    .then(({data: res}) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.msg)
-                        }
-                        this.options = res.data.options
-                    })
-                    .catch(() => {
-                    })
-            },
-            btKeyUpItemCode (e) {
-                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-                this.dataForm.itemCode = e.target.value
-            },
-            btKeyUpItemContent (e) {
-                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-                this.dataForm.itemContent = e.target.value
-            },
-            btKeyUpNickName (e) {
-                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-                this.dataForm.nickName = e.target.value
-            },
-            btKeyUpMobile (e) {
-                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-                this.dataForm.mobile = e.target.value
-            }
+export default {
+  mixins: [mixinViewModule],
+  name: 'ItemCloseList',
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/item/page',
+        getDataListIsPage: true,
+        exportURL: '/events/item/unexport'
+      },
+      dataForm: {
+        id: '',
+        itemState: '5',
+        startTime: '',
+        endTime: '',
+        streetId: '',
+        communityId: '',
+        gridId: '',
+        itemCode: '',
+        itemContent: '',
+        nickName: '',
+        mobile: ''
+      },
+      ids: [],
+      options: [],
+      detailVisible: false,
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
         }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
+      }
+    }
+  },
+  components: {
+    Detail
+  },
+  created: function () {
+    this.getOptions()
+  },
+  watch: {
+    ids: function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = this.ids[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = this.ids[1]
+        this.dataForm.gridId = this.ids[2]
+      }
+    }
+  },
+  methods: {
+    detailAction (id) {
+      this.$parent.selectComponent = 'ItemCloseDetailView'
+      this.$router.push({ path: '/events-item-close', query: { id: id } })
+    },
+    getOptions () {
+      this.$http
+        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => {
+        })
+    },
+    btKeyUpItemCode (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.itemCode = e.target.value
+    },
+    btKeyUpItemContent (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.itemContent = e.target.value
+    },
+    btKeyUpNickName (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.nickName = e.target.value
+    },
+    btKeyUpMobile (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.mobile = e.target.value
     }
+  }
+}
 </script>

src/views/modules/events/item-end-list.vue

@@ -35,10 +35,10 @@
                     ></el-input>
                 </el-form-item>
                 <br>
-                <el-form-item label="提交人" prop="itemCode" label-width="100px">
+                <el-form-item label="联系人姓名" prop="itemCode" label-width="100px">
                     <el-input
                             v-model="dataForm.nickName"
-                            placeholder="请输入提交人"
+                            placeholder="请输入联系人姓名"
                             clearable
                             @keyup.native="btKeyUpNickName"
                             style="width:250px;"
@@ -126,7 +126,7 @@
                 ></el-table-column>
                 <el-table-column
                         prop="nickName"
-                        label="提交人"
+                        label="联系人姓名"
                         header-align="center"
                         width="200"
                         align="center"
@@ -218,116 +218,116 @@
 </template>
 
 <script>
-    import mixinViewModule from '@/mixins/view-module'
-    import Detail from './item-detail'
+import mixinViewModule from '@/mixins/view-module'
+import Detail from './item-detail'
 
-    export default {
-        mixins: [mixinViewModule],
-        name: 'ItemEndList',
-        data() {
-            return {
-                mixinViewModuleOptions: {
-                    getDataListURL: '/events/item/page',
-                    getDataListIsPage: true,
-                  exportURL: '/events/item/unexport'
-                },
-                dataForm: {
-                    id: '',
-                    itemState: '10',
-                    startTime: '',
-                    endTime: '',
-                    streetId: '',
-                    communityId: '',
-                    gridId: '',
-                    itemCode: '',
-                    itemContent: '',
-                    nickName: '',
-                    mobile: ''
-                },
-                detailVisible: false,
-                ids: [],
-                options: [],
-             pickerBeginDateBefore: {
-                    disabledDate: (time) => {
-                        let beginDateVal = this.dataForm.endTime;
-                        if (beginDateVal) {
-                            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
-                        }
-                    }
-                    },
-                pickerBeginDateAfter: {
-                    disabledDate: (time) => {
-                        let EndDateVal = this.dataForm.startTime;
-                        if (EndDateVal) {
-                            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
-                        }
-                    }
-                },
-            }
-        },
-        components: {
-            Detail
-        },
-        created: function () {
-            this.getOptions()
-        },
-        watch: {
-            ids: function (val) {
-                if (val.length === 0) {
-                    this.dataForm.streetId = ''
-                    this.dataForm.communityId = ''
-                    this.dataForm.gridId = ''
-                }
-                if (val.length === 1) {
-                    this.dataForm.streetId = this.ids[0]
-                    this.dataForm.communityId = ''
-                    this.dataForm.gridId = ''
-                }
-                if (val.length === 2) {
-                    this.dataForm.streetId = this.ids[0]
-                    this.dataForm.communityId = this.ids[1]
-                    this.dataForm.gridId = ''
-                }
-                if (val.length === 3) {
-                    this.dataForm.streetId = this.ids[0]
-                    this.dataForm.communityId = this.ids[1]
-                    this.dataForm.gridId = this.ids[2]
-                }
-            }
-        },
-        methods: {
-            detailAction1(id) {
-                this.$parent.selectComponent = 'ItemCloseDetailView'
-                this.$router.push({path: '/events-item-end', query: {id: id}})
-            },
-            getOptions() {
-                this.$http
-                    .get(`/sys/user/deptOptions/getByLoginUser`)
-                    .then(({data: res}) => {
-                        if (res.code !== 0) {
-                            return this.$message.error(res.msg)
-                        }
-                        this.options = res.data.options
-                    })
-                    .catch(() => {
-                    })
-            },
-            btKeyUpItemCode (e) {
-                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-                this.dataForm.itemCode = e.target.value
-            },
-            btKeyUpItemContent (e) {
-                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-                this.dataForm.itemContent = e.target.value
-            },
-            btKeyUpNickName (e) {
-                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-                this.dataForm.nickName = e.target.value
-            },
-            btKeyUpMobile (e) {
-                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-                this.dataForm.mobile = e.target.value
-            }
+export default {
+  mixins: [mixinViewModule],
+  name: 'ItemEndList',
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/events/item/page',
+        getDataListIsPage: true,
+        exportURL: '/events/item/unexport'
+      },
+      dataForm: {
+        id: '',
+        itemState: '10',
+        startTime: '',
+        endTime: '',
+        streetId: '',
+        communityId: '',
+        gridId: '',
+        itemCode: '',
+        itemContent: '',
+        nickName: '',
+        mobile: ''
+      },
+      detailVisible: false,
+      ids: [],
+      options: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
         }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
+      }
+    }
+  },
+  components: {
+    Detail
+  },
+  created: function () {
+    this.getOptions()
+  },
+  watch: {
+    ids: function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = this.ids[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.ids[0]
+        this.dataForm.communityId = this.ids[1]
+        this.dataForm.gridId = this.ids[2]
+      }
+    }
+  },
+  methods: {
+    detailAction1 (id) {
+      this.$parent.selectComponent = 'ItemCloseDetailView'
+      this.$router.push({ path: '/events-item-end', query: { id: id } })
+    },
+    getOptions () {
+      this.$http
+        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => {
+        })
+    },
+    btKeyUpItemCode (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.itemCode = e.target.value
+    },
+    btKeyUpItemContent (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.itemContent = e.target.value
+    },
+    btKeyUpNickName (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.nickName = e.target.value
+    },
+    btKeyUpMobile (e) {
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.mobile = e.target.value
     }
+  }
+}
 </script>

src/views/modules/events/item-examine-list.vue

@@ -15,10 +15,10 @@
                             style="width:200px;"
                     ></el-input>
                 </el-form-item>
-                <el-form-item label="提交人" prop="userName" label-width="100px">
+                <el-form-item label="联系人姓名" prop="userName" label-width="100px">
                     <el-input
                             v-model="dataForm.userName"
-                            placeholder="请输入提交人"
+                            placeholder="请输入联系人姓名"
                             clearable
                             @keyup.native="btKeyUpNickName"
                             style="width:250px;"
@@ -79,7 +79,7 @@
                 ></el-table-column>
                 <el-table-column
                         prop="nickName"
-                        label="提交人"
+                        label="联系人姓名"
                         header-align="center"
                         min-width="200"
                         align="center"

src/views/modules/events/itemfusingdelay-list.vue

@@ -31,10 +31,10 @@
           ></el-input>
         </el-form-item>
         <br>
-        <el-form-item label="提交人" prop="itemCode" label-width="100px">
+        <el-form-item label="联系人姓名" prop="itemCode" label-width="100px">
           <el-input
                   v-model="dataForm.nickName"
-                  placeholder="请输入提交人"
+                  placeholder="请输入联系人姓名"
                   clearable
                   @keyup.native="btKeyUpNickName"
                   style="width:250px;"
@@ -134,7 +134,7 @@
         ></el-table-column>
         <el-table-column
                 prop="nickName"
-                label="提交人"
+                label="联系人姓名"
                 header-align="center"
                 min-width="200"
                 align="center"
@@ -264,16 +264,16 @@ export default {
         itemContent: '',
         nickName: '',
         mobile: '',
-        stateName:'',
-        handleStateName:'',
-        handleReason:''
+        stateName: '',
+        handleStateName: '',
+        handleReason: ''
       },
-      handleVisible:false,
+      handleVisible: false,
       ids: [],
       options: [],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
-          let beginDateVal = this.dataForm.endTime;
+          let beginDateVal = this.dataForm.endTime
           if (beginDateVal) {
             return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
           }
@@ -281,12 +281,12 @@ export default {
       },
       pickerBeginDateAfter: {
         disabledDate: (time) => {
-          let EndDateVal = this.dataForm.startTime;
+          let EndDateVal = this.dataForm.startTime
           if (EndDateVal) {
             return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
           }
         }
-      },
+      }
     }
   },
   components: {
@@ -322,21 +322,21 @@ export default {
     }
   },
   methods: {
-    dealAction(id) {
+    dealAction (id) {
       this.$parent.selectComponent = 'ItemfusingdelayDetailView'
-      this.$router.push({path: '/events-itemfusingdelay', query: {id: id}})
+      this.$router.push({ path: '/events-itemfusingdelay', query: { id: id } })
     },
-    getOptions() {
+    getOptions () {
       this.$http
-              .get(`/sys/user/deptOptions/getByLoginUser`)
-              .then(({data: res}) => {
-                if (res.code !== 0) {
-                  return this.$message.error(res.msg)
-                }
-                this.options = res.data.options
-              })
-              .catch(() => {
-              })
+        .get(`/sys/user/deptOptions/getByLoginUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => {
+        })
     },
     btKeyUpItemCode (e) {
       e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')