提交

MrShi

5 小时以前 26ebe244b9f52749d7b268ea03d069a5c999f0e1

提交

 admin/src/components/business/OperaInternalCompanyWindow.vue

@@ -25,6 +25,24 @@
              <el-radio :label="1"  v-if="sysConfig() && sysConfig().orgUserDataOrigin!=3">内部组织</el-radio>
            </el-radio-group>
          </el-form-item>
          <el-form-item label="对接部门" prop="relationCompanyId" v-if="form.type === 0">
            <treeselect
              @input="changeSel"
              v-model="form.relationCompanyId"
              placeholder="请选择"
              :options="companyTree"
              :normalizer="normalizeOptions"
              :default-expand-level="1"
              noChildrenText="没有子选项"
              noOptionsText="没有可选项"
              noResultsText="没有匹配的结果" />
          </el-form-item>
          <el-form-item label="对接人员" prop="relationUserId" v-if="form.type === 0">
            <el-select v-model="form.relationUserId" clearable filterable placeholder="请选择">
              <el-option v-for="item in memberList" :key="item.id" :label="item.name" :value="item.id">
              </el-option>
            </el-select>
          </el-form-item>
        </el-form>
    </GlobalWindow>
</template>
@@ -33,6 +51,8 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import companySelect from '@/components/common/companySelect'
import { allList } from '@/api/business/member'
import { fetchList as companyTree } from '@/api/business/company'
export default {
  name: 'OperaInternalCompanyWindow',
  extends: BaseOpera,
@@ -40,6 +60,9 @@
  data () {
    return {
      options: [],
      memberList: [],
      companyTree: [],
      isInit: false,
      // è¡¨å•æ•°æ®
      form: {
        id: null,
@@ -48,7 +71,9 @@
        parentId: null,
        disable: false,
        parentName: '',
        sortnum: ''
        sortnum: '',
        relationCompanyId: null,
        relationUserId: null
      },
      editType: '',
      parentId: null,
@@ -79,12 +104,14 @@
    open (title, target, row, editType) {
      this.title = title
      this.editType = editType
      this.isInit = false
      if (editType === 'edit') {
        this.parentId = row.parentId
      } else if (editType === 'add') {
        this.parentId = target.parentId
      }
      this.visible = true
      this.getfindCompanyTreePage()
      this.form = {
        id: null,
        type: 0,
@@ -93,7 +120,9 @@
        disable: false,
        parentName: '',
        parentType: null,
        sortnum: null
        sortnum: null,
        relationCompanyId: null,
        relationUserId: null
      }
      if (target != null) {
        this.form.parentId = target.id
@@ -106,18 +135,73 @@
          this.$refs.form.resetFields()
          this.form[this.configData['field.id']] = null
          this.form.type = 0
          this.isInit = true
        })
        return
      }
      // ç¼–辑
      const savedRelationUserId = row.relationUserId
      this.$nextTick(() => {
        this.originPermissionCode = target.code
        for (const key in this.form) {
          if (row[key] !== undefined) {
          this.form[key] = row[key]
          }
        }
        if (target.type == 0) {
          this.form.type = 0
        }

        setTimeout(() => {
          this.form.relationUserId = savedRelationUserId
        }, 500)
        
        this.loadMember().then(() => {
          this.isInit = true
        })
      })
    },
    normalizeOptions (node) {
      if (!node.childList || !node.childList.length) {
        delete node.childList
      }
      return {
        id: node.id,
        label: node.name,
        children: node.childList
      }
    },
    changeSel () {
      const { form } = this
      if (form.relationCompanyId) {
        this.loadMember().then(() => {
          if (this.isInit) {
            this.form.relationUserId = ''
          }
        })
      }
    },
    getfindCompanyTreePage () {
      companyTree(1)
        .then(res => {
          if (res && res.length > 0) {
            this.companyTree = res
          }
        })
    },
    loadMember () {
      const { form } = this
      return allList({
        type: 2,
        companyId: form.relationCompanyId
      })
        .then(res => {
          this.memberList = res
        })
        .catch(e => {
        })
        .finally(() => {
          this.isWorking = false
      })
    },
    // ç¡®è®¤æ–°å»º/修改
@@ -133,7 +217,9 @@
            parentId: this.form.parentId,
            name: this.form.name,
            type: this.form.type,
            sortnum: this.form.sortnum
            sortnum: this.form.sortnum,
            relationCompanyId: this.form.relationCompanyId,
            relationUserId: this.form.relationUserId
          })
            .then(() => {
              this.visible = false
@@ -152,7 +238,9 @@
            parentId: this.form.parentId,
            name: this.form.name,
            type: this.form.type,
            sortnum: this.form.sortnum
            sortnum: this.form.sortnum,
            relationCompanyId: this.form.relationCompanyId,
            relationUserId: this.form.relationUserId
          })
            .then(() => {
              this.visible = false

 admin/src/components/business/OperaJkCabinetLogWindow.vue

@@ -30,8 +30,8 @@
      <el-form-item label="钥匙柜格编码(关联jk_cabinet_grid)" prop="gridId">
        <el-input v-model="form.gridId" placeholder="请输入钥匙柜格编码(关联jk_cabinet_grid)" v-trim/>
      </el-form-item>
      <el-form-item label="验证方式 0刷脸 1刷卡" prop="authType">
        <el-input v-model="form.authType" placeholder="请输入验证方式 0刷脸 1刷卡" v-trim/>
      <el-form-item label="验证方式 0刷脸 1刷卡 2管理员 3自动" prop="authType">
        <el-input v-model="form.authType" placeholder="请输入验证方式 0刷脸 1刷卡 2管理员 3自动" v-trim/>
      </el-form-item>
      <el-form-item label="车辆编码（关联cars)" prop="carId">
        <el-input v-model="form.carId" placeholder="请输入车辆编码（关联cars)" v-trim/>

 admin/src/views/business/internalCompany.vue

@@ -49,6 +49,8 @@
        </el-table-column>
        <el-table-column prop="sortnum" align="center" label="排序码" min-width="80px"></el-table-column>
        <el-table-column prop="companyNamePath" label="组织路径" min-width="200px"  show-overflow-tooltip></el-table-column>
        <el-table-column prop="relationCompanyName" label="对接部门" width="100px"></el-table-column>
        <el-table-column prop="relationUserName" label="对接人员" width="100px"></el-table-column>
        <el-table-column prop="editorName" label="操作人" width="100px"></el-table-column>
        <el-table-column prop="editDate" label="最后更新时间" min-width="150px"></el-table-column>
        <el-table-column label="操作" width="230" fixed="right">

 admin/src/views/business/jkCabinetLog.vue

@@ -33,6 +33,7 @@
          <el-option label="刷脸" :value="0"></el-option>
          <el-option label="刷卡" :value="1"></el-option>
          <el-option label="管理员" :value="2"></el-option>
          <el-option label="自动" :value="3"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="状态" prop="status">
@@ -63,6 +64,7 @@
            <el-link :underline="false" v-if="row.authType === 0">刷脸</el-link>
            <el-link :underline="false" v-if="row.authType === 1">刷卡</el-link>
            <el-link :underline="false" v-if="row.authType === 2">管理员</el-link>
            <el-link :underline="false" v-if="row.authType === 3">自动</el-link>
          </template>
        </el-table-column>
        <el-table-column prop="cabinetName" label="所属钥匙柜" min-width="100px"></el-table-column>

 admin/whyc_admin/avatar/man.png

Binary files differ

 admin/whyc_admin/avatar/woman.png

Binary files differ

 admin/whyc_admin/favicon.ico

Binary files differ

 admin/whyc_admin/index.html

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/css/app.3bc19038.css

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/css/chunk-vendors.04c7bff3.css

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/fonts/element-icons.535877f5.woff

Binary files differ

 admin/whyc_admin/static/fonts/element-icons.732389de.ttf

Binary files differ

 admin/whyc_admin/static/img/404-tip.4d90651f.png

Binary files differ

 admin/whyc_admin/static/img/404.5c17595f.png

Binary files differ

 admin/whyc_admin/static/img/bg@2x.db5d20c2.png

Binary files differ

 admin/whyc_admin/static/img/bg_shenhe@2x.632406ea.png

Binary files differ

 admin/whyc_admin/static/img/bg_shenhe_chexiao@2x.966d7ff8.png

Binary files differ

 admin/whyc_admin/static/img/bg_shenhe_fail@2x.f31e62ff.png

Binary files differ

 admin/whyc_admin/static/img/bg_shenhe_pass@2x.356d8eee.png

Binary files differ

 admin/whyc_admin/static/img/default_homeimg.f3e4e5d0.png

Binary files differ

 admin/whyc_admin/static/img/default_nodata.5d1df1bb.png

Binary files differ

 admin/whyc_admin/static/img/department.0c08872e.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/dictionary.ad728d75.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/home_func1.2273dcea.png

Binary files differ

 admin/whyc_admin/static/img/home_func5.d27eba52.png

Binary files differ

 admin/whyc_admin/static/img/listener.fcf79708.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/log-login.5b08fa8b.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/log-opera.f8d4f877.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/log.f8f7b2f8.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/login_img@2x.cb2860d8.png

Binary files differ

 admin/whyc_admin/static/img/man.6eaa0e37.png

Binary files differ

 admin/whyc_admin/static/img/permission.14c1bcf1.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/position.8a867f13.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/pwd.f73be658.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/role.2a1931ed.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/shield.54851228.svg

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/img/sousuo.069aa14f.png

Binary files differ

 admin/whyc_admin/static/js/app.dca8c4bb.js

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/js/app.dca8c4bb.js.map

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/js/chunk-vendors.6d4f879a.js

ÎļþÒÑɾ³ý

 admin/whyc_admin/static/js/chunk-vendors.6d4f879a.js.map

ÎļþÒÑɾ³ý

 admin/whyc_admin/template/cars.xlsx

Binary files differ

 admin/whyc_admin/template/jkCustomerTemplate.xlsx

Binary files differ

 admin/whyc_admin/template/jkLineTemplate.xlsx

Binary files differ

 admin/whyc_admin/template/jkOrdersTemplate.xlsx

Binary files differ

 admin/whyc_admin/template/member.xlsx

Binary files differ

 admin/whyc_admin/template/oil.xlsx

Binary files differ

 admin/whyc_admin/template/traintime.xlsx

Binary files differ