Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc into master

ebc-middle-platform/src/conf/services.js

@@ -194,6 +194,7 @@ export default {
    GET_WORK_EMPLOYEE: '/workEmployee/queryWorkEmployee', // 查询人员信息
    GET_ALL_ORGANIZE: '/workEmployee/queryAllOrganize', // 查询部门信息
    ADD_WORK_EMPLOYEE: '/workEmployee/createWorkEmployee', // 新增人员信息
    DEL_WORK_EMPLOYEE: '/workEmployee/deleteWorkEmployee', // 删除人员信息
    UPD_WORK_EMPLOYEE: '/workEmployee/modifyWorkEmployee' // 修改人员信息
  }
}

ebc-middle-platform/src/modules/system-management/terminal-management.vue

@@ -317,8 +317,8 @@ export default {
      }).then(res => {
        // 请求成功处理...
        this.tableLoading = false
        this.table.data = res.data.dataList
        this.table.pager.total = res.data.dataNum
        this.table.data = res.data.data
        this.table.pager.total = res.data.total
      }).catch(res => {
        // 请求失败处理...
        this.tableLoading = false
@@ -328,8 +328,9 @@ export default {
      this.$test.post(services.device.GET_ASSOCIATINFO, {bindType: '1', name: name} // 查询人员
      ).then(res => {
        // 请求成功处理...
        debugger
        this.currentLoading = false
        this.itemList[0].goList = res.data.result
        this.itemList[0].goList = res.data
      }).catch(res => {
        // 请求失败处理...
      })
@@ -337,7 +338,7 @@ export default {
      ).then(res => {
        // 请求成功处理...
        this.currentLoading = false
        var arr = res.data.result
        var arr = res.data
        for (let i = 0; i < arr.length; i++) {
          arr[i].name = arr[i].resourceToolName
          arr[i].code = arr[i].resourceToolCode
@@ -352,7 +353,7 @@ export default {
      this.$test.post(services.device.GET_DEVICETYPES, {}
      ).then(res => {
        // 请求成功处理...
        this.deviceTypes = res.data.dataList
        this.deviceTypes = res.data
      }).catch(res => {
        // 请求失败处理...
      })
@@ -387,12 +388,10 @@ export default {
          ).then(res => {
            // 请求成功处理...
            this.fullLoading = false
            if (res.data.result) {
              this.relevance = false
              this.loading = false
              this.$Message.success('提交成功!')
              this.getList()
            }
            this.relevance = false
            this.loading = false
            this.$Message.success('提交成功!')
            this.getList()
          }).catch(res => {
            // 请求失败处理...
            this.loading = false
@@ -465,13 +464,9 @@ export default {
          }).then(res => {
            // 请求成功处理...
            that.fullLoading = false
            if (res.data.result) {
              that.$Message.success('提交成功!')
              that.cancel()
              that.getList()
            } else {
              that.$Message.danger(res.data.errMsg)
            }
            that.$Message.success('提交成功!')
            that.cancel()
            that.getList()
          }).catch(res => {
            // 请求失败处理...
          })
@@ -490,13 +485,9 @@ export default {
      }).then(res => {
        // 请求成功处理...
        this.fullLoading = false
        if (res.data.result) {
          this.$Message.success('提交成功!')
          this.cancel()
          this.getList()
        } else {
          this.$Message.danger(res.data.errMsg)
        }
        this.$Message.success('提交成功!')
        this.cancel()
        this.getList()
      }).catch(res => {
        // 请求失败处理...
        this.fullLoading = false
@@ -518,12 +509,8 @@ export default {
            ).then(res => {
              // 请求成功处理...
              this.fullLoading = false
              if (res.data.result) {
                this.$Message.success('解绑成功!')
                this.getList()
              } else {
                this.$Message.danger('解绑失败!')
              }
              this.$Message.success('解绑成功!')
              this.getList()
            }).catch(res => {
              // 请求失败处理...
              this.fullLoading = false
@@ -556,12 +543,8 @@ export default {
            ).then(res => {
              // 请求成功处理...
              this.fullLoading = false
              if (res.data.result) {
                this.$Message.success('解绑成功!')
                this.getList()
              } else {
                this.$Message.danger('解绑失败!')
              }
              this.$Message.success('解绑成功!')
              this.getList()
            }).catch(res => {
              // 请求失败处理...
              this.fullLoading = false
@@ -578,14 +561,14 @@ export default {
      ).then(res => {
        // 请求成功处理...
        this.updateModal = true
        this.updateFormValidate.number = res.data.resultData.deviceNo
        this.updateFormValidate.type = res.data.resultData.deviceTypeName
        this.updateFormValidate.typeId = res.data.resultData.deviceTypeId
        this.updateFormValidate.id = res.data.resultData.deviceId
        if (res.data.resultData.remarks === '无') {
        this.updateFormValidate.number = res.data.deviceNo
        this.updateFormValidate.type = res.data.deviceTypeName
        this.updateFormValidate.typeId = res.data.deviceTypeId
        this.updateFormValidate.id = res.data.deviceId
        if (res.data.remarks === '无') {
          this.updateFormValidate.desc = ''
        } else {
          this.updateFormValidate.desc = res.data.resultData.remarks
          this.updateFormValidate.desc = res.data.remarks
        }
      }).catch(res => {
        // 请求失败处理...
@@ -603,16 +586,16 @@ export default {
      this.$test.post(services.device.GET_BIND_DEVICE, {deviceId: row.deviceId}
      ).then(res => {
        // 请求成功处理...
        if (res.data.resultData == null) {
        if (res.data == null) {
          this.relevanceValidate.msgisShow = false
          this.relevanceValidate.msg = ''
        } else {
          this.relevanceValidate.msgisShow = true
          var name = ''
          if (res.data.resultData.bindType === '1') {
            name = res.data.resultData.name
          if (res.data.bindType === '1') {
            name = res.data.name
          } else {
            name = res.data.resultData.resourceToolName
            name = res.data.resourceToolName
          }
          this.relevanceValidate.msg = '当前终端已关联 ' + name + ' ,点击保存更改关联关系'
        }
@@ -630,12 +613,8 @@ export default {
          ).then(res => {
            // 请求成功处理...
            this.fullLoading = false
            if (res.data.result) {
              this.$Message.success('操作成功')
              this.getList()
            } else {
              this.$Message.danger(res.data.errMsg)
            }
            this.$Message.success('操作成功')
            this.getList()
          }).catch(res => {
            // 请求失败处理...
            this.fullLoading = false
@@ -665,12 +644,8 @@ export default {
            ).then(res => {
              // 请求成功处理...
              this.fullLoading = false
              if (res.data.result) {
                this.$Message.success('操作成功')
                this.getList()
              } else {
                this.$Message.danger(res.data.errMsg)
              }
              this.$Message.success('操作成功')
              this.getList()
            }).catch(res => {
              // 请求失败处理...
              this.fullLoading = false

ebc-middle-platform/src/modules/system-management/user-management.vue

@@ -29,10 +29,10 @@
            </div>
          </div>
          <div class="btns">
            <t-button color="secondary" class="reset-btn" @click="onReset">重置</t-button>
            <t-button color="success" icon="search-outline" @click="onSearch">查询</t-button>
            <t-button color="secondary" class="reset-btn" @click="onReset">重置</t-button>
            <t-button color="secondary" icon="upload-outline" @click="toExport">导出至Excel</t-button>
            <t-button color="secondary" icon="delete-outline" @click="toExport">删除</t-button>
            <t-button color="secondary" icon="delete-outline" @click="toBatchRemove">删除</t-button>
          </div>
        </div>
      </div>
@@ -45,12 +45,12 @@
      </div>
    </div>
    <div>
      <t-table :data="table.data" @selection-change="handleSelectionChange">
      <t-table :loading="tableLoading" :data="table.data" @selection-change="handleSelectionChange">
        <t-table-column type="selection" width="70"></t-table-column>
        <t-table-column prop="name" label="姓名"></t-table-column>
        <t-table-column prop="code" label="员工编号"></t-table-column>
        <t-table-column prop="orgName" label="部门"></t-table-column>
        <t-table-column prop="mainJobPosition" label="职务"></t-table-column>
        <t-table-column :formatter="type_formatter" prop="mainJobPosition" label="职务"></t-table-column>
        <t-table-column prop="age" label="年龄"></t-table-column>
        <t-table-column prop="mainWirelessCall" label="手机"></t-table-column>
        <t-table-column
@@ -90,10 +90,8 @@
          ></t-select-tree>
        </t-form-item>
        <t-form-item label="职务" prop="job">
          <t-select v-model="formValidate.job" label-in-value placeholder="请选择职务">
            <t-option value="1">职务1</t-option>
            <t-option value="2">职务2</t-option>
            <t-option value="3">职务3</t-option>
          <t-select v-model="formValidate.job" placeholder="请选择职务">
            <t-option v-for="(item, index) in JobPostions" :key="index" :value="item.code">{{ item.value }}</t-option>
          </t-select>
        </t-form-item>
        <t-form-item label="出生年月" prop="age">
@@ -110,6 +108,41 @@
        <t-button class="submit-button" @click="submit">保存</t-button>
      </div>
    </t-modal>
    <t-modal :visibled.sync="updateModal" :mask-closable="false" title="编辑用户" >
      <t-form ref="updateFormValidate" :model="updateFormValidate" :rules="updateRuleValidate" :label-width="80" label-position="left">
        <t-form-item label="员工编号" prop="number">
          {{ updateFormValidate.number }}
        </t-form-item>
        <t-form-item label="姓名" prop="name">
          <t-input v-model="updateFormValidate.name" placeholder="请输入姓名"></t-input>
        </t-form-item>
        <t-form-item label="部门" prop="department">
          <t-select-tree
            v-model="updateFormValidate.department"
            :node-data="cloneNodes"
            node-key="code"
          ></t-select-tree>
        </t-form-item>
        <t-form-item label="职务" prop="job">
          <t-select v-model="updateFormValidate.job" placeholder="请选择职务">
            <t-option v-for="(item, index) in JobPostions" :key="index" :value="item.code">{{ item.value }}</t-option>
          </t-select>
        </t-form-item>
        <t-form-item label="出生年月" prop="age">
          <!--          <t-input v-model="formValidate.age" placeholder="请输入数字"></t-input>-->
          <t-date-picker v-model="updateFormValidate.age"
                         placeholder="请选择出生年月"></t-date-picker>
        </t-form-item>
        <t-form-item label="手机" prop="phone">
          <t-input v-model="updateFormValidate.phone" placeholder="请输入手机号码"></t-input>
        </t-form-item>
      </t-form>
      <div slot="footer">
        <t-button @click="cancel">取消</t-button>
        <t-button class="submit-button" @click="updateSubmit">保存</t-button>
      </div>
    </t-modal>
    <t-loading v-model="fullLoading" fullscreen tip="加载中...."></t-loading>
  </div>
</template>
<script>
@@ -128,6 +161,9 @@ export default {
      },
      departments: [],
      selections: [],
      JobPostions: [],
      fullLoading: false,
      tableLoading: true,
      queryCondition: {
        type: '',
        employeeNo: '',
@@ -227,6 +263,81 @@ export default {
            }
          }
        ]
      },
      updateModal: false,
      updateFormValidate: {
        id: '',
        name: '',
        number: '',
        department: '',
        job: '',
        age: '',
        phone: ''
      },
      updateRuleValidate: {
        name: [
          {
            required: true,
            message: '姓名不能为空',
            trigger: 'blur'
          }
        ],
        department: [
          {
            required: true,
            message: '部门不能为空',
            trigger: 'change',
            validator: function(rule, value, callback) {
              // TODO 判断编号重复
              if (!value) {
                callback(rule.message)
              } else {
                return true
              }
            }
          }
        ],
        job: [
          {
            required: true,
            message: '职务不能为空',
            trigger: 'change',
            validator: function(rule, value, callback) {
              // TODO 判断编号重复
              if (!value) {
                callback(rule.message)
              } else {
                return true
              }
            }
          }
        ],
        age: [
          {
            required: true,
            message: '出生年月不能为空',
            trigger: 'change'
          }
        ],
        phone: [
          {
            required: true,
            message: '手机不能为空',
            trigger: 'blur'
          },
          {
            message: '手机格式不正确',
            trigger: 'blur',
            validator: function(rule, value, callback) {
              let pattern = /^1[3456789]\d{9}$/
              if (!pattern.test(value)) {
                callback(rule.message)
              } else {
                return true
              }
            }
          }
        ]
      }
    }
  },
@@ -247,17 +358,17 @@ export default {
    }
  },
  mounted() {
    // this.table.data = this.table.data.concat(this.table.data)
    // this.table.pager.total = this.table.data.length
    this.getList()
    this.getDepartmentsList()
    this.initJobPostion()
  },
  methods: {
    getList: function () {
      this.tableLoading = true
      this.$test
        .post(services.workEmployee.GET_WORK_EMPLOYEE, {
          data: {
            orgId: this.queryCondition.department,
            orgCode: this.queryCondition.department,
            code: this.queryCondition.employeeNo,
            name: this.queryCondition.employeeName
          },
@@ -266,13 +377,23 @@ export default {
        })
        .then((res) => {
          // 请求成功处理...
          this.tableLoading = false
          this.table.data = res.data.data
          this.table.pager.total = res.data.total
        })
        .catch((res) => {
          // 请求失败处理...
          this.tableLoading = false
        })
    },
    type_formatter(row, column) {
      var arr = this.JobPostions.filter((item) => {
        return item.code === row.mainJobPosition
      })
      if (arr[0]) {
        return arr[0].value
      }
    },
    getDepartmentsList: function () {
      this.$test
        .post(services.workEmployee.GET_ALL_ORGANIZE, {})
@@ -286,7 +407,7 @@ export default {
                label: res.data[i].name,
                title: res.data[i].name,
                id: res.data[i].code,
                data: res.data[i].id,
                data: res.data[i].code,
                pid: res.data[i].parentCode
              })
            } else {
@@ -294,7 +415,7 @@ export default {
                label: res.data[i].name,
                title: res.data[i].name,
                id: res.data[i].code,
                data: res.data[i].id
                data: res.data[i].code
              })
            }
          }
@@ -303,6 +424,17 @@ export default {
          // 请求失败处理...
        })
    },
    initJobPostion: function () {
      this.$test
        .post(services.workEmployee.GET_JOB_POSTION, {})
        .then((res) => {
          // 请求成功处理...
          this.JobPostions = res.data
        })
        .catch((res) => {
          // 请求失败处理...
        })
    },
    onChange(value) {
      console.log('date change:' + value)
    },
@@ -330,68 +462,67 @@ export default {
      this.getList()
    },
    handleClick(row) {
      this.modal = true
      // var params = new FormData()
      // params.append('data', JSON.stringify({
      //   FACILITY_ID: row.FACILITY_ID
      // }))
      // this.$test.post(services.equipment.GET_ONE_EQUIPMENT, params
      // ).then(res => {
      //   // 请求成功处理...
      //   this.updateModal = true
      //   this.updateRow = res.data.resultData
      //   this.typeChange(2)
      // }).catch(res => {
      //   // 请求失败处理...
      // })
      this.updateModal = true
      this.$test
        .post(services.workEmployee.GET_WORK_EMPLOYEE, {
          data: {
            id: row.id
          },
          pageNumber: 1,
          pageSize: 1
        })
        .then((res) => {
        // 请求成功处理...
          var user = res.data.data[0]
          this.updateFormValidate = {
            id: user.id,
            name: user.name,
            number: user.code,
            department: user.orgCode,
            job: user.mainJobPosition,
            age: user.birthday,
            phone: user.mainWirelessCall
          }
        })
        .catch((res) => {
        // 请求失败处理...
        })
    },
    remove(row) {
      this.$Confirm.confirm({
        title: '确认要删除用户张三吗？',
        content: '删除后不可恢复',
      let confirm = {
        title: '请确认',
        content: '删除后不可恢复,确认删除吗?',
        ok: () => {
          console.log('点击了确定')
        },
        cancel: () => {
          console.log('点击了取消')
          this.fullLoading = true
          this.$test.post(services.workEmployee.DEL_WORK_EMPLOYEE, {ids: row.id this.$test.post(services.workEmployee.DEL_WORK_EMPLOYEE, {ids: row.id}
          ).then(res => {
            // 请求成功处理...
            this.fullLoading = false
            this.$Message.success('操作成功')
            this.getList()
          }).catch(res => {
            // 请求失败处理...
            this.fullLoading = false
          })
        }
      })
      // let that = this
      // let confirm = {
      //   title: '请确认',
      //   content: '删除后不可恢复,确认删除吗?',
      //   ok: function () {
      //     var params = new FormData()
      //     params.append('data', JSON.stringify({
      //       params: {
      //         FACILITY_ID: row.FACILITY_ID
      //       }
      //     }))
      //     this.$test.post(services.equipment.DEL_EQUIPMENT, params
      //     ).then(res => {
      //       // 请求成功处理...
      //       that.$Message.success('操作成功')
      //       that.getList()
      //     }).catch(res => {
      //       // 请求失败处理...
      //     })
      //   }
      // }
      // this.$Confirm.confirm(confirm)
      }
      this.$Confirm.confirm(confirm)
    },
    cancel() {
      this.modal = false
      this.updateModal = false
      this.$refs['formValidate'].resetFields()
    },
    submit() {
      var that = this
      this.$refs.formValidate.validate(valid => {
        if (valid) {
          that.fullLoading = true
          that.$test.post(services.workEmployee.ADD_WORK_EMPLOYEE, {
            name: that.formValidate.name,
            code: that.formValidate.number,
            organizeCode: that.formValidate.department,
            mainJobPosition: that.formValidate.job.value,
            mainJobPosition: that.formValidate.job,
            birthday: that.formValidate.age,
            // cardType: "居民身份证",
            // cardNo: "43252345455412305567X",
@@ -400,16 +531,47 @@ export default {
          }
          ).then(res => {
            // 请求成功处理...
            if (res.data) {
              that.$Message.success('提交成功!')
              that.cancel()
              that.getList()
            } else {
              this.$Message.danger('终端编号重复!')
            }
            that.fullLoading = false
            that.$Message.success('提交成功!')
            that.cancel()
            that.getList()
            // this.getList(this.table.pager.currentPage, this.table.pager.size, this.queryCondition.equipmentType, this.queryCondition.equipmentName, this.queryCondition.equipmentNumber)
          }).catch(res => {
            // 请求失败处理...
            that.fullLoading = false
          })
        } else {
          this.$Message.danger('表单验证失败!')
        }
      })
    },
    updateSubmit() {
      var that = this
      this.$refs.updateFormValidate.validate(valid => {
        if (valid) {
          that.fullLoading = true
          var birthday = that.updateFormValidate.age.replaceAll(' 00:00:00', '')
          that.$test.post(services.workEmployee.UPD_WORK_EMPLOYEE, {
            id: that.updateFormValidate.id,
            name: that.updateFormValidate.name,
            code: that.updateFormValidate.number,
            organizeCode: that.updateFormValidate.department,
            mainJobPosition: that.updateFormValidate.job,
            birthday: birthday,
            // cardType: "居民身份证",
            // cardNo: "43252345455412305567X",
            // gender: "男",
            mainWirelessCall: that.updateFormValidate.phone
          }
          ).then(res => {
            // 请求成功处理...
            this.fullLoading = false
            that.$Message.success('提交成功!')
            that.cancel()
            that.getList()
          }).catch(res => {
            // 请求失败处理...
            this.fullLoading = false
          })
        } else {
          this.$Message.danger('表单验证失败!')
@@ -422,6 +584,38 @@ export default {
    addUser() {
      this.modal = true
      this.getDepartmentsList()
    },
    toBatchRemove(row) { // 批量删除
      if (this.selections.length === 0) {
        this.$Confirm.info({
          title: '提示',
          content: '请选中需要删除的人员。'
        })
      } else {
        var ids = ''
        for (let i = 0; i < this.selections.length; i++) {
          ids += this.selections[i].id + ','
        }
        ids = ids.substring(0, ids.length - 1)
        let confirm = {
          title: '请确认',
          content: '删除后不可恢复,确认删除吗?',
          ok: () => {
            this.fullLoading = true
            this.$test.post(services.workEmployee.DEL_WORK_EMPLOYEE, {ids: ids}
            ).then(res => {
              // 请求成功处理...
              this.fullLoading = false
              this.$Message.success('操作成功')
              this.getList()
            }).catch(res => {
              // 请求失败处理...
              this.fullLoading = false
            })
          }
        }
        this.$Confirm.confirm(confirm)
      }
    }
  }
}