【工作日志】所有网格相关信息改为党支部-王公峰-2020-11-19

src/views/modules/workRecord/dailyrecordinfoDetail.vue

@@ -187,8 +187,18 @@ export default {
   },
   methods: {
     getOptions () {
+      // this.$http
+      //   .get(`/sys/user/deptOptions/getDeptAuthByUser`)
+      //   .then(({ data: res }) => {
+      //     if (res.code !== 0) {
+      //       return this.$message.error(res.msg)
+      //     }
+      //     this.options = res.data.options
+      //   })
+      //   .catch(() => {})
+      var paa = {deptType:'party'}
       this.$http
-        .get(`/sys/user/deptOptions/getDeptAuthByUser`)
+        .post(`/sys/user/deptOptions/getByLoginUserNew`,paa)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)

src/views/modules/workRecord/monthexcellentgridDetail.vue

@@ -329,8 +329,18 @@ export default {
       })
     }, 1000, { 'leading': true, 'trailing': false }),
     getOptions () {
+      // this.$http
+      //   .get(`/sys/user/deptOptions/getDeptAuthByUser`)
+      //   .then(({ data: res }) => {
+      //     if (res.code !== 0) {
+      //       return this.$message.error(res.msg)
+      //     }
+      //     this.options = res.data.options
+      //   })
+      //   .catch(() => {})
+      var paa = {deptType:'party'}
       this.$http
-        .get(`/sys/user/deptOptions/getDeptAuthByUser`)
+        .post(`/sys/user/deptOptions/getByLoginUserNew`,paa)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)

src/views/modules/workRecord/monthexcellentpersonDetail.vue

@@ -9,10 +9,10 @@
         </el-select>
       </el-form-item>
       <el-form-item label="榜样名称" prop="name" label-width="100px">
-        <el-input v-model="dataForm.name" placeholder="榜样名称" clearable maxlength="20" @keyup.native="btKeyUpContent" style="width:300px"></el-input>
+        <el-input v-model="dataForm.name" placeholder="榜样名称" clearable maxlength="20" style="width:300px"></el-input>
       </el-form-item>
       <el-form-item label="联系电话" prop="mobile" label-width="100px">
-        <el-input v-model="dataForm.mobile" placeholder="联系电话" clearable maxlength="20" @keyup.native="btKeyUpContent" style="width:300px"></el-input>
+        <el-input v-model="dataForm.mobile" placeholder="联系电话" clearable maxlength="20" style="width:300px"></el-input>
       </el-form-item>
       <el-form-item label="会议内容" prop="content" label-width="100px">
         <el-input

src/views/modules/workRecord/monthgridsortDetail.vue

@@ -134,8 +134,18 @@ export default {
       })
     },
     getOptions () {
+      // this.$http
+      //   .get(`/sys/user/deptOptions/getDeptAuthByUser`)
+      //   .then(({ data: res }) => {
+      //     if (res.code !== 0) {
+      //       return this.$message.error(res.msg)
+      //     }
+      //     this.options = res.data.options
+      //   })
+      //   .catch(() => {})
+      var paa = {deptType:'party'}
       this.$http
-        .get(`/sys/user/deptOptions/getDeptAuthByUser`)
+        .post(`/sys/user/deptOptions/getByLoginUserNew`,paa)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -190,7 +200,7 @@ export default {
           return value === deptId
         })
         if (data) {
-          this.$message.error('第' + (j + 1) + '名：' + deptName + '已存在，请更换网格！')
+          this.$message.error('第' + (j + 1) + '名：' + deptName + '已存在，请更换党支部！')
           return false
         }
         deptIdArr.push(this.dataForm.sortList[j].deptId)

src/views/modules/workRecord/monthrecordinfo.vue

@@ -79,8 +79,8 @@
             </div>
             <div style="width:1px;height:5px;"></div>
             <div>
-              <el-button size="mini" type="primary" icon="el-icon-plus" :disabled="scope.row.isUpdate == '0' || scope.row.isHaveGrid == '1'" @click="addGridHandle(scope.row.id,'0')">{{ '示范网格' }}</el-button>
-              <el-button size="mini" type="primary" icon="el-icon-plus" :disabled="scope.row.isUpdate == '0' || scope.row.isHaveSort == '1'" @click="addSortHandle(scope.row.id,'0')">{{ '网格排序' }}</el-button>
+              <el-button size="mini" type="primary" icon="el-icon-plus" :disabled="scope.row.isUpdate == '0' || scope.row.isHaveGrid == '1'" @click="addGridHandle(scope.row.id,'0')">{{ '示范党支部' }}</el-button>
+              <el-button size="mini" type="primary" icon="el-icon-plus" :disabled="scope.row.isUpdate == '0' || scope.row.isHaveSort == '1'" @click="addSortHandle(scope.row.id,'0')">{{ '党支部排序' }}</el-button>
             </div>
             <div style="width:1px;height:5px;"></div>
             <!-- <div>
@@ -88,8 +88,8 @@
             </div>
             <div style="width:1px;height:1px;"></div> -->
             <div>
-              <el-button size="mini" type="primary" icon="el-icon-edit" :disabled="scope.row.isUpdate == '0'" @click="addHandle(scope.row.id,'0',scope.row.caseId,scope.row.deptId,scope.row.personId,scope.row.isHaveSort)">{{ '修改月报' }}</el-button>
-              <el-button size="mini" type="primary" icon="el-icon-search" @click="addHandle(scope.row.id,'1',scope.row.caseId,scope.row.deptId,scope.row.personId,scope.row.isHaveSort)">{{ '查看月报' }}</el-button>
+              <el-button size="mini" type="primary" icon="el-icon-edit" :disabled="scope.row.isUpdate == '0'" @click="addHandle(scope.row.id,'0',scope.row.caseId,scope.row.gridId,scope.row.personId,scope.row.isHaveSort)">{{ '修改月报' }}</el-button>
+              <el-button size="mini" type="primary" icon="el-icon-search" @click="addHandle(scope.row.id,'1',scope.row.caseId,scope.row.gridId,scope.row.personId,scope.row.isHaveSort)">{{ '查看月报' }}</el-button>
             </div>
           </template>
         </el-table-column>
@@ -167,9 +167,9 @@ export default {
     this.getOptions()
   },
   methods: {
-    addHandle (id, disabled, caseId, deptId, personId, isHaveSort) {
+    addHandle (id, disabled, caseId, gridId, personId, isHaveSort) {
       this.$parent.selectComponent = 'MonthrecordinfoDetail'
-      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: id, disabled: disabled, caseId: caseId, deptId: deptId, personId: personId, isHaveSort: isHaveSort } })
+      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: id, disabled: disabled, caseId: caseId, gridId: gridId, personId: personId, isHaveSort: isHaveSort } })
     },
     addCaseHandle (infoId, disabled) {
       this.$parent.selectComponent = 'MonthexcellentcaseDetail'

src/views/modules/workRecord/monthrecordinfoDetail.vue

@@ -4,9 +4,9 @@
       <el-form>
         <el-form-item style="margin-left:35px;">
           <el-button v-if="isShowCaseBtn" type="primary" @click="goToCaseHandle()">{{ '优秀案例' }}</el-button>
-          <el-button v-if="isShowGridBtn" type="primary" @click="goToGridHandle()">{{ '示范网格' }}</el-button>
+          <el-button v-if="isShowGridBtn" type="primary" @click="goToGridHandle()">{{ '示范党支部' }}</el-button>
           <el-button v-if="isShowPersonBtn" type="primary" @click="goToPersonHandle()">{{ '身边榜样' }}</el-button>
-          <el-button v-if="isShowSortBtn" type="primary" @click="goToSortHandle()">{{ '网格排序' }}</el-button>
+          <el-button v-if="isShowSortBtn" type="primary" @click="goToSortHandle()">{{ '党支部排序' }}</el-button>
         </el-form-item>
       </el-form>
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'" :disabled="pageDisabled">
@@ -112,7 +112,7 @@ export default {
       isShowPersonBtn: false,
       isShowSortBtn: false,
       caseId: '',
-      deptId: '',
+      gridId: '',
       personId: '',
       queryDisabled: ''
     }
@@ -155,10 +155,10 @@ export default {
       this.isShowCaseBtn = true
       this.caseId = this.$route.query.caseId
     }
-    if (this.$route.query.deptId !== '' && this.$route.query.deptId != null) {
+    if (this.$route.query.gridId !== '' && this.$route.query.gridId != null) {
       // 展示示范网格跳转按钮
       this.isShowGridBtn = true
-      this.deptId = this.$route.query.deptId
+      this.gridId = this.$route.query.gridId
     }
     if (this.$route.query.personId !== '' && this.$route.query.personId != null) {
       // 展示身边榜样跳转按钮
@@ -177,7 +177,7 @@ export default {
     },
     goToGridHandle () {
       this.$parent.selectComponent = 'MonthexcellentgridDetail'
-      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: this.deptId, disabled: this.queryDisabled, infoId: this.dataForm.id } })
+      this.$router.push({ path: '/workRecord-Monthrecordinforoute', query: { id: this.gridId, disabled: this.queryDisabled, infoId: this.dataForm.id } })
     },
     goToPersonHandle () {
       this.$parent.selectComponent = 'MonthexcellentpersonDetail'