Merge remote-tracking branch 'origin/master'

src/views/allot/list.vue

@@ -148,6 +148,7 @@
         sortable
       />
       <el-table-column
+        :formatter="formatter.getChineseName"
         align="center"
         label="受理人"
         prop="shouliren"
@@ -528,12 +529,8 @@ export default {
             shigongdanweiDianhua: this.multipleSelection[0].shigongdanweiDianhua,
             xiadariqi: this.formatter.dateFormat('YYYY-MM-dd')
           }
-          if (
+          if (this.multipleSelection[0].shebeileixing) {
-            this.multipleSelection[0].shebeileixing !== undefined &&
+            this.title = '任务分配（' + this.multipleSelection[0].shebeileixing + '）'
-              this.multipleSelection[0].shebeileixing !== null
-          ) {
-            this.title =
-                '任务分配（' + this.multipleSelection[0].shebeileixing + '）'
           }
           this.dialogVisible = true
           this.$nextTick(() => {
@@ -736,7 +733,9 @@ export default {
     },
     selectDepartmentUser(val) {
       this.renlingren = []
+      this.renwudan.teamId = undefined
       this.getTeamList(val)
+      this.getUserList(val)
     },
     getUserList(val) {
       this.api({
@@ -746,7 +745,12 @@ export default {
           departmentId: val
         }
       }).then((data) => {
-        this.users = data
+        this.users = data.map(row => {
+          return {
+            id: row.id,
+            name: row.nickname
+          }
+        })
       })
     },
     openZhongjian() {
@@ -928,7 +932,7 @@ export default {
       })
     },
     selectTeamUser(val) {
-      console.log(this.teams)
+      this.renlingren = []
       const _this = this
       for (let i = 0; i < this.teams.length; i++) {
         if (this.teams[i].id === val) {

src/views/bjd/dt_list.vue

@@ -132,7 +132,7 @@
         </template>
       </el-table-column>
       <el-table-column align="center" label="设备台数" prop="totalNum" min-width="50" />
-      <el-table-column align="center" label="受理人员" prop="shouliren" min-width="50" />
+      <el-table-column :formatter="formatter.getChineseName" align="center" label="受理人员" prop="shouliren" min-width="50" />
       <el-table-column align="center" label="操作" min-width="60" fixed="right">
         <template slot-scope="scope">
           <el-button type="primary" size="small" circle icon="el-icon-edit" title="编辑" @click="editBjd(scope.$index)" />

src/views/bjd/jj_list.vue

@@ -145,7 +145,7 @@
         </template>
       </el-table-column>
       <el-table-column align="center" label="设备台数" prop="totalNum" min-width="50" />
-      <el-table-column align="center" label="受理人员" prop="shouliren" min-width="50" />
+      <el-table-column :formatter="formatter.getChineseName" align="center" label="受理人员" prop="shouliren" min-width="50" />
       <el-table-column align="center" label="报检渠道" prop="dataSource" min-width="50">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.dataSource===0" type="info">

src/views/bjd/qy_list.vue

@@ -114,7 +114,7 @@
         </template>
       </el-table-column>
       <el-table-column align="center" label="设备台数" prop="totalNum" min-width="50" />
-      <el-table-column align="center" label="受理人员" prop="shouliren" min-width="50" />
+      <el-table-column :formatter="formatter.getChineseName" align="center" label="受理人员" prop="shouliren" min-width="50" />
       <el-table-column align="center" label="操作" min-width="60">
         <template slot-scope="scope">
           <el-button type="primary" size="mini" circle icon="el-icon-edit" title="编辑" @click="editBjd(scope.$index)" />