Skip to content

H
haoban-4
Commit 469ad51e by 无尘
Options

fix: 修改组件属性

parent 3b4fef1c
Showing with 96 additions and 132 deletions
.eslintrc.js
......@@ -161,9 +161,6 @@ module.exports = {
"comma-spacing": 2,
//@off 手动关闭: 冒号后必须加空格
"key-spacing": 2,
// @fixable 结尾禁止使用分号
//@off [vue官方推荐无分号,不知道大家是否可以接受？先手动off掉] 讨论
// "semi": [2,"never"],
// 代码块嵌套的深度禁止超过 5 层
"max-depth": [1, 20],
// 回调函数嵌套禁止超过 4 层，多了请用 async await 替代
......@@ -204,12 +201,22 @@ module.exports = {
"object-curly-spacing": [2,"always"],//{后 }前必须有一个空格
"space-before-function-paren": [2, "never"],//函数圆括号之前无空格
"space-infix-ops": 2,
"semi": [2, "always"],//语句强制分号结尾
"semi": [2, "always"],// 代码使用分号结尾
"valid-jsdoc": ["error", {
"requireReturn": false,
"requireParamDescription": false,
"requireReturnDescription": false
}], //强制JSDoc注释
}], //使用JSDoc注释
"vue/attribute-hyphenation": ["error", "always"], // 自定义组件的属性使用连字符，不可使用小驼峰命名法
"vue/component-name-in-template-casing": ["error", "kebab-case", { registeredComponentsOnly: false }], // 自定义组件在template中的标签使用连字符
"vue/html-closing-bracket-newline": ["error", { // vue组件template中不能以 > 开头
"singleline": "never",
"multiline": "never"
}],
"vue/html-quotes": [ "error", "double"], // vue组件template中使用双引号
"vue/name-property-casing": ["error", "PascalCase"], // vue组件name属性使用大驼峰命名法
"vue/prop-name-casing": ["error", "camelCase"], // vue组件props的key使用小驼峰命名法
"vue/this-in-template": ["error", "never"], // vue组件template中不能使用this
"vue/order-in-components": ["error", {
"order": [
"el",
......
src/components/app/my-customer/customer-assign.vue
......@@ -33,9 +33,7 @@
<div class="font-14 color-606266"><el-checkbox :disabled="clerkOptions.length > assignPeople || unbindFlag" :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox></div>
<div class="font-14 color-606266">
<el-checkbox v-model="checked" @change="changeHand">手动分配</el-checkbox> <span class="span-line"></span>
<span
>可分配会员 <span class="color-303133">{{ assignPeople }}</span> 人</span
>
<span>可分配会员 <span class="color-303133">{{ assignPeople }}</span> 人</span>
</div>
</div>
<div>
......@@ -43,11 +41,9 @@
<el-checkbox-group v-model="checkedClerks" @change="handleCheckedChange">
<template v-for="(item, index) in clerkOptions">
<li class="clerk-cell font-14 color-606266" :key="index + 'clerk'">
<el-checkbox :disabled="item.disabled" :label="item.clerkId" @change="changeCell($event, item)">{{ item.clerkName }}</el-checkbox
><span v-if="!item.bindFlag" class="font-14 color-f56c6c p-l-20">未关联企微用户</span>
<el-checkbox :disabled="item.disabled" :label="item.clerkId" @change="changeCell($event, item)">{{ item.clerkName }}</el-checkbox><span v-if="!item.bindFlag" class="font-14 color-f56c6c p-l-20">未关联企微用户</span>
<span v-if="!checked && checkedClerks.includes(item.clerkId)" class="p-l-20">
分配会员 <span class="color-303133">{{ item.memberCount }}</span> 人</span
>
分配会员 <span class="color-303133">{{ item.memberCount }}</span> 人</span>
<span v-if="checked && checkedClerks.includes(item.clerkId)" class="p-l-20 p-r-10">分配会员 </span><el-input-number v-if="checked && checkedClerks.includes(item.clerkId)" class="w-100" v-model="item.memberCount" controls-position="right" @blur="blurNum" @change="handleChange" :step="1" step-strictly :min="1" :max="999999999"></el-input-number><span v-if="checked && checkedClerks.includes(item.clerkId)" class="p-l-10"> 人</span>
</li>
</template>
......
src/components/app/my-customer/org-tree.vue
......@@ -33,14 +33,14 @@ getSelectData(obj) {
<span :class="['font-12 color-606266', item.isStore == 1 || !item.hasSonNode ? 'color-fff' : '', item.expand ? 'el-icon-caret-bottom' : 'el-icon-caret-right']"></span><span v-if="item.loading" class="el-tree-node__loading-icon el-icon-loading"></span><span class="font-14 color-606266 p-l-10">{{ item.label }}</span>
</div>
</div>
<li-row v-show="!!item.children.length && item.expand" :departObj="departObj" :itemObj="item" :itemData="item.children" @getSelectData="getSelectData"></li-row>
<li-row v-show="!!item.children.length && item.expand" :depart-obj="departObj" :item-obj="item" :item-data="item.children" @getSelectData="getSelectData"></li-row>
</li>
</ul>
</template>
<script>
export default {
name: 'li-row',
name: 'LiRow',
props: {
brandId: {
type: String,
......
src/components/common/gic-select-store.vue
......@@ -46,9 +46,7 @@
</div>
<div class="show-select-num cursor-pointer w-350" slot="reference" >
已经选择{{ dailyRuleForm.stores.length }}家门店
<span class="el-input__suffix"
><span class="el-input__suffix-inner"><i :class="['el-select__caret el-input__icon el-icon-arrow-up', storeVisible ? 'is-reverse' : '']"></i></span
></span>
<span class="el-input__suffix"><span class="el-input__suffix-inner"><i :class="['el-select__caret el-input__icon el-icon-arrow-up', storeVisible ? 'is-reverse' : '']"></i></span></span>
</div>
</el-popover>
</template>
......
src/components/company/auth-commit.vue
......@@ -13,13 +13,13 @@
-->
<template>
<div class="auth-commit-admin">
<common-alert-tip :width="'328px'" :tipContent="tipContent" class="m-b-32"></common-alert-tip>
<common-alert-tip :width="'328px'" :tip-content="tipContent" class="m-b-32"></common-alert-tip>
<el-form :model="commitForm" :rules="rules" ref="commitForm" label-width="100px" class="dialog-form">
<el-form-item label="申请事项" prop="commitName">
<el-input class="w-198" v-model="commitForm.commitName" disabled></el-input>
</el-form-item>
<el-form-item label="申请理由" prop="auditReason">
<limit-textarea :inputWidth="298" :inputValue.sync="commitForm.auditReason" :holder="'请输入申请理由'" :getByType="'word'" :maxLength="50"></limit-textarea>
<limit-textarea :input-width="298" :input-value.sync="commitForm.auditReason" :holder="'请输入申请理由'" :get-by-type="'word'" :max-length="50"></limit-textarea>
</el-form-item>
<el-form-item label="审核人" prop="">
<div class="flex flex-wrap audit-admin-body">
......
src/components/company/contact-tree.vue
......@@ -21,15 +21,14 @@ import contactTree from '/components/company/contact-tree.vue';
<span :class="['font-12 color-606266', item.isStore == 1 || !item.hasSonNode ? 'color-fff' : '', item.expand ? 'el-icon-caret-bottom' : 'el-icon-caret-right']"></span><span v-if="item.loading" class="el-tree-node__loading-icon el-icon-loading"></span><span :class="['font-14 p-r-10 iconfont iconqiye-tianchong', !!item.loading ? '' : 'p-l-10', departObj.departmentId == item.departmentId ? 'color-2f54eb' : 'color-dedfe6']"></span><span class="font-14 color-606266 span-departName">{{ item.departmentName }}</span>
</div>
</div>
<li-row v-if="item.expand" :departObj="departObj" :itemData="item.children" @getSelectData="getSelectData"></li-row
><!-- v-show="!!item.children.length && item.expand" -->
<li-row v-if="item.expand" :depart-obj="departObj" :item-data="item.children" @getSelectData="getSelectData"></li-row><!-- v-show="!!item.children.length && item.expand" -->
</li>
<!-- </draggable> -->
</ul>
</template>
<script>
export default {
name: 'li-row',
name: 'LiRow',
components: {
},
props: {
......
src/components/company/fail-log.vue
......@@ -9,12 +9,10 @@
<div role="alert" class="el-alert el-alert--info flex flex-align-start">
<i class="el-alert__icon el-icon-info font-12 color-2f54eb"></i>
<div class="el-alert__content">
<span class="el-alert__title color-606266 font-14"
>失败可能：分组创建失败或门店及成员创建失败<br />
<span class="el-alert__title color-606266 font-14">失败可能：分组创建失败或门店及成员创建失败<br />
通讯录同步分为两步串联创建：<br />
第一步同步分组，若出现分组创建失败，则分组及下面的门店及成员均会创建失败<br />
第二步同步门店及成员，若分组创建成功，会同步门店及成员，若门店创建失败，则门店下成员也会创建失败</span
>
第二步同步门店及成员，若分组创建成功，会同步门店及成员，若门店创建失败，则门店下成员也会创建失败</span>
</div>
</div>
</div>
......
src/components/company/new-depart-member.vue
......@@ -42,9 +42,7 @@
<template slot-scope="scope">{{ scope.row.postion || '--' }}</template>
</el-table-column>
<el-table-column prop="" label="手机号码" show-overflow-tooltip>
<template slot-scope="scope"
>{{ scope.row.nationCode }}-{{ scope.row.phoneNumber }}</template
>
<template slot-scope="scope">{{ scope.row.nationCode }}-{{ scope.row.phoneNumber }}</template>
</el-table-column>
<el-table-column prop="" label="">
<template slot="header" >
......@@ -81,8 +79,8 @@
</div>
</div>
</div>
<add-member v-if="memberVisible" :defaultDepart="defaultDepart" :memberObj="memberObj" @refreshData="refreshData" @changeObj="changeObj"></add-member>
<related-table v-if="relateShow" :relateRow="relateRow" @closeTable="closeTable"></related-table>
<add-member v-if="memberVisible" :default-depart="defaultDepart" :member-obj="memberObj" @refreshData="refreshData" @changeObj="changeObj"></add-member>
<related-table v-if="relateShow" :relate-row="relateRow" @closeTable="closeTable"></related-table>
<help-tip v-if="tipShow" @toCloseTip="toCloseTip"></help-tip>
</div>
</template>
......
src/components/company/related-table.vue
......@@ -49,7 +49,7 @@
</el-table-column>
</el-table>
</div>
<add-relate v-if="addShow" :departObj="relateRow" @refreshData="refreshData"></add-relate>
<add-relate v-if="addShow" :depart-obj="relateRow" @refreshData="refreshData"></add-relate>
</el-dialog>
</template>
<script>
......
src/components/company/store-auth-dialog.vue
......@@ -23,8 +23,8 @@
<el-radio class="m-l-40 m-r-8" v-model="formData.sendRange" label="1" @change="changeRange">选择分组</el-radio>
<el-radio class="m-l-40 m-r-8" v-model="formData.sendRange" label="2" @change="changeRange">选择门店</el-radio>
<div v-if="(formData.sendRange == '1' || formData.sendRange == '2') && !formData.selectList.length || String(formData.sendRange) == 'null' || formData.sendRange === ''" class="el-form-item__error">请选择绑定门店</div>
<store-auth-group v-if="formData.sendRange == '1'" :companyId="enterpriseId" :storeType="bindType" :selectGroup="selectGroupData" @checkGroupIds="checkGroupIds"></store-auth-group>
<store-auth-store v-if="formData.sendRange == '2'" :companyId="enterpriseId" :storeType="bindType" :selectStore="selectStoreData" @checkStoreIds="checkStoreIds"></store-auth-store>
<store-auth-group v-if="formData.sendRange == '1'" :company-id="enterpriseId" :store-type="bindType" :select-group="selectGroupData" @checkGroupIds="checkGroupIds"></store-auth-group>
<store-auth-store v-if="formData.sendRange == '2'" :company-id="enterpriseId" :store-type="bindType" :select-store="selectStoreData" @checkStoreIds="checkStoreIds"></store-auth-store>
</div>
</div>
</div>
......
src/components/limit-input-blur.vue
......@@ -21,10 +21,7 @@
<template>
<div :class="['input-line-cell', limitClass]" :style="{ width: inputWidth + 'px' }">
<el-input :style="{ width: inputWidth + 'px' }" v-model="itemValue" :disabled="disflag" :placeholder="holder" @blur="value => toInput(value)"> </el-input>
<span class="tip"
><span class="len_span">{{ inputNum }}</span
>/{{ limitLength }}</span
>
<span class="tip"><span class="len_span">{{ inputNum }}</span>/{{ limitLength }}</span>
</div>
</template>
<script>
......
src/components/limit-input.vue
......@@ -21,10 +21,7 @@
<template>
<div :class="['input-line-cell', limitClass]" :style="{ width: inputWidth + 'px' }">
<el-input :style="{ width: inputWidth + 'px' }" v-model="itemValue" :disabled="disflag" :placeholder="holder" @blur="inputBlur()" @keyup.native="value => toInput(value)"> </el-input>
<span class="input-cell-tip"
><span class="len_span">{{ inputNum }}</span
>/{{ limitLength }}</span
>
<span class="input-cell-tip"><span class="len_span">{{ inputNum }}</span>/{{ limitLength }}</span>
</div>
</template>
<script>
......
src/components/limit-textarea.vue
......@@ -20,10 +20,7 @@
<template>
<div class="input-line-cell" :style="{ width: inputWidth + 'px' }">
<el-input :style="{ width: inputWidth + 'px' }" v-model="itemValue" :placeholder="holder" type="textarea" :rows="3" :disabled="disInput" @blur="inputBlur()" @keyup.native="value => toInput(value)"> </el-input>
<span class="tip"
><span class="len_span">{{ inputNum }}</span
>/{{ limitLength }}</span
>
<span class="tip"><span class="len_span">{{ inputNum }}</span>/{{ limitLength }}</span>
</div>
</template>
<script>
......
src/components/set/add-self-app.vue
......@@ -15,15 +15,15 @@
<div class="">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="应用名称" prop="secretName">
<el-input class="w-440" type="text" v-model="ruleForm.secretName" maxLength="30"> </el-input>
<el-input class="w-440" type="text" v-model="ruleForm.secretName" max-length="30"> </el-input>
<span class="input-cell-tip">{{ruleForm.secretName.length}}/30</span>
</el-form-item>
<el-form-item label="Agentld" prop="agentId">
<el-input class="w-440" type="textarea" rows="3" v-model="ruleForm.agentId" maxLength="30"></el-input>
<el-input class="w-440" type="textarea" rows="3" v-model="ruleForm.agentId" max-length="30"></el-input>
<span class="input-cell-tip top-40">{{ruleForm.agentId.length}}/30</span>
</el-form-item>
<el-form-item label="Secret" prop="secretVal">
<el-input class="w-440" type="textarea" rows="3" v-model="ruleForm.secretVal" maxLength="100"></el-input>
<el-input class="w-440" type="textarea" rows="3" v-model="ruleForm.secretVal" max-length="100"></el-input>
<span class="input-cell-tip top-40">{{ruleForm.secretVal.length}}/100</span>
</el-form-item>
</el-form>
......
src/components/set/select-admin-store.vue
......@@ -16,7 +16,7 @@
<div class="common-mask cursor-pointer" @click.stop="handleClose"></div>
<div class="bind-body border-box">
<div class="auth-range-title font-18 color-303133 m-b-20">门店管辖范围</div>
<common-alert-tip :width="'100%'" :tipContent="tipContent"></common-alert-tip>
<common-alert-tip :width="'100%'" :tip-content="tipContent"></common-alert-tip>
<div class="el-form-item el-form-item--large m-t-20">
<label for="name" class="el-form-item__label" style="width: 143px;">
门店绑定授权范围
......@@ -25,8 +25,8 @@
<el-radio v-model="bindFormData.bindStoreMode" :label="0" disabled>所有门店</el-radio>
<el-radio class="m-l-40 m-r-8" v-model="bindFormData.bindStoreMode" :label="1" disabled>选择分组</el-radio>
<el-radio class="m-l-40 m-r-8" v-model="bindFormData.bindStoreMode" :label="2" disabled>选择门店</el-radio>
<store-auth-group-dis v-if="bindFormData.bindStoreMode == '1'" :companyId="selectEnterpriseId" :storeType="1" :selectGroup="bindFormData.bindStoreMode == 1 ? bindFormData.bindRange : []"></store-auth-group-dis>
<store-auth-store-dis v-if="bindFormData.bindStoreMode == '2'" :companyId="selectEnterpriseId" :storeType="1" :selectStore="bindFormData.bindStoreMode == 2 ? bindFormData.bindRange : []"></store-auth-store-dis>
<store-auth-group-dis v-if="bindFormData.bindStoreMode == '1'" :company-id="selectEnterpriseId" :store-type="1" :select-group="bindFormData.bindStoreMode == 1 ? bindFormData.bindRange : []"></store-auth-group-dis>
<store-auth-store-dis v-if="bindFormData.bindStoreMode == '2'" :company-id="selectEnterpriseId" :store-type="1" :select-store="bindFormData.bindStoreMode == 2 ? bindFormData.bindRange : []"></store-auth-store-dis>
</div>
</div>
<div class="el-form-item el-form-item--large">
......@@ -37,8 +37,8 @@
<el-radio v-model="bindFormData.shareStoreMode" :label="0" disabled>所有门店</el-radio>
<el-radio class="m-l-40 m-r-8" v-model="bindFormData.shareStoreMode" :label="1" disabled>选择分组</el-radio>
<el-radio class="m-l-40 m-r-8" v-model="bindFormData.shareStoreMode" :label="2" disabled>选择门店</el-radio>
<store-auth-group-dis v-if="bindFormData.shareStoreMode == '1'" :companyId="selectEnterpriseId" :storeType="2" :selectGroup="bindFormData.shareStoreMode == 1 ? bindFormData.shareRange : []" ></store-auth-group-dis>
<store-auth-store-dis v-if="bindFormData.shareStoreMode == '2'" :companyId="selectEnterpriseId" :storeType="2" :selectStore="bindFormData.shareStoreMode == 2 ? bindFormData.shareRange : []"></store-auth-store-dis>
<store-auth-group-dis v-if="bindFormData.shareStoreMode == '1'" :company-id="selectEnterpriseId" :store-type="2" :select-group="bindFormData.shareStoreMode == 1 ? bindFormData.shareRange : []" ></store-auth-group-dis>
<store-auth-store-dis v-if="bindFormData.shareStoreMode == '2'" :company-id="selectEnterpriseId" :store-type="2" :select-store="bindFormData.shareStoreMode == 2 ? bindFormData.shareRange : []"></store-auth-store-dis>
</div>
</div>
<div class="el-form-item el-form-item--large">
......@@ -50,8 +50,8 @@
<el-radio class="m-l-40 m-r-8" v-model="formData.sendRange" label="1" @change="changeRange">选择分组</el-radio>
<el-radio class="m-l-40 m-r-8" v-model="formData.sendRange" label="2" @change="changeRange">选择门店</el-radio>
<div v-if="(formData.sendRange == '1' || formData.sendRange == '2') && !formData.selectList.length || String(formData.sendRange) == 'null' || formData.sendRange === ''" class="el-form-item__error">请选择绑定门店</div>
<store-auth-group v-if="formData.sendRange == '1'" :companyId="selectEnterpriseId" :storeType="2" :selectGroup="selectGroupData" @checkGroupIds="checkGroupIds"></store-auth-group>
<store-auth-store v-if="formData.sendRange == '2'" :companyId="selectEnterpriseId" :storeType="2" :selectStore="selectStoreData" @checkStoreIds="checkStoreIds"></store-auth-store>
<store-auth-group v-if="formData.sendRange == '1'" :company-id="selectEnterpriseId" :store-type="2" :select-group="selectGroupData" @checkGroupIds="checkGroupIds"></store-auth-group>
<store-auth-store v-if="formData.sendRange == '2'" :company-id="selectEnterpriseId" :store-type="2" :select-store="selectStoreData" @checkStoreIds="checkStoreIds"></store-auth-store>
</div>
</div>
<div class="el-form-item el-form-item--large">
......
src/views/apps/customer-app/customer-assign.vue
......@@ -11,27 +11,22 @@
<div class="border-box">
<div class="list-body flex">
<div class="list-left border-box">
<org-tree v-if="gicData.length" :brandId="brandId" :departObj="departObj" :itemData="gicData" @getSelectData="getSelectData"></org-tree>
<org-tree v-if="gicData.length" :brand-id="brandId" :depart-obj="departObj" :item-data="gicData" @getSelectData="getSelectData"></org-tree>
</div>
<div class="list-right p-20 border-box">
<store-list v-if="!showMember" :brandId="brandId" :departObj="departObj" @getStore="getStore"></store-list>
<store-list v-if="!showMember" :brand-id="brandId" :depart-obj="departObj" @getStore="getStore"></store-list>
<div v-if="showMember" class="list-right-body">
<div role="navigation" class="el-breadcrumb m-b-20">
<span class="el-breadcrumb__item" v-for="(item, index) in navData" :key="index + 'nav'"
><span role="link" class="el-breadcrumb__inner is-link" @click="changeDepart(item, index)"
><span class="el-breadcrumb__inner is-link font-14 color-606266">
<span class="el-breadcrumb__item" v-for="(item, index) in navData" :key="index + 'nav'"><span role="link" class="el-breadcrumb__inner is-link" @click="changeDepart(item, index)"><span class="el-breadcrumb__inner is-link font-14 color-606266">
{{ index == navData.length - 1 ? item.storeName : item.storeGroupName }}
</span></span
><i v-if="index != navData.length - 1" class="el-breadcrumb__separator el-icon-arrow-right"></i
></span>
</span></span><i v-if="index != navData.length - 1" class="el-breadcrumb__separator el-icon-arrow-right"></i></span>
</div>
<div class="table-top flex flex-space-between">
<div>
<el-select class="w-168" v-model="clerkId" placeholder="" @change="changeCondition">
<el-option label="全部" value="0"></el-option>
<el-option label="无归属" value="-1"></el-option>
<el-option v-for="item in clerkOptions" :key="item.clerkId" :label="item.clerkName" :value="item.clerkId"> </el-option> </el-select
><el-input placeholder="请输入会员姓名/手机号/卡号" maxlength="50" prefix-icon="el-icon-search" v-model="searchInput" class="w-264 m-l-10" style="width: 264px;" clearable @clear="clearSearch" @keyup.native="value => toInput(value, searchInput)"> </el-input>
<el-option v-for="item in clerkOptions" :key="item.clerkId" :label="item.clerkName" :value="item.clerkId"> </el-option> </el-select><el-input placeholder="请输入会员姓名/手机号/卡号" maxlength="50" prefix-icon="el-icon-search" v-model="searchInput" class="w-264 m-l-10" style="width: 264px;" clearable @clear="clearSearch" @keyup.native="value => toInput(value, searchInput)"> </el-input>
</div>
<el-button type="primary" @click="toAssign">批量分配会员</el-button>
</div>
......@@ -56,9 +51,7 @@
<template slot-scope="scope">{{ scope.row.gradeName || '--' }}</template>
</el-table-column>
<el-table-column prop="" label="消费总额" show-overflow-tooltip>
<template slot-scope="scope"
>{{ scope.row.costFee }} {{ scope.row.costFee == null && scope.row.costFee != 0 ? '--' : '' }}</template
>
<template slot-scope="scope">{{ scope.row.costFee }} {{ scope.row.costFee == null && scope.row.costFee != 0 ? '--' : '' }}</template>
</el-table-column>
<el-table-column prop="" label="最近消费时间" show-overflow-tooltip>
<template slot-scope="scope">
......@@ -87,7 +80,7 @@
</div>
</div>
</div>
<customer-assign v-if="assignShow" :brandId="brandId" :clerkId="clerkId" :searchParams="searchInput" :editRow="editRow" :chooseAll="selectRadio" :departObj="storeObj" :multipleData="multipleSelection" @closeText="closeText" @submitText="submitText"></customer-assign>
<customer-assign v-if="assignShow" :brand-id="brandId" :clerk-id="clerkId" :search-params="searchInput" :edit-row="editRow" :choose-all="selectRadio" :depart-obj="storeObj" :multiple-data="multipleSelection" @closeText="closeText" @submitText="submitText"></customer-assign>
</div>
</template>
<script>
......
src/views/apps/customer-app/index.vue
......@@ -13,11 +13,11 @@
<div class="right-box" style="min-height: calc(100vh - 112px);">
<div class="apps-content flex" style="min-height: calc(100vh - 112px);">
<div class="apps-content-left w-157" style="min-height: calc(100vh - 112px);">
<common-detail-left :tabListData="tabListData" :activeSelTab="activeSelTab" @setSelectTab="setSelectTab"> </common-detail-left>
<common-detail-left :tab-list-data="tabListData" :active-sel-tab="activeSelTab" @setSelectTab="setSelectTab"> </common-detail-left>
</div>
<div class="apps-content-right">
<transition name="fade" mode="out-in">
<router-view :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"> </router-view>
<router-view :brand-id="activeBrand" :active-group-id="activeGroup" :tab-type="activeTab" @showTab="showTab"> </router-view>
</transition>
</div>
</div>
......@@ -31,7 +31,7 @@ import commonDetailLeft from '@/components/app/app-detail-left.vue';
// import errMsg from '@/common/js/error';
// import showMsg from '@/common/js/showmsg';
export default {
name: 'reviewed',
name: 'Reviewed',
components: {
navCrumb,
commonDetailLeft
......
src/views/apps/index.vue
......@@ -9,7 +9,7 @@
<template>
<div class="enterprise-wrap">
<!-- 公共头部菜单插件 -->
<vue-office-header :projectName="projectName" @collapseTag="collapseTag" @toRouterView="toRouterView"> </vue-office-header>
<vue-office-header :project-name="projectName" @collapseTag="collapseTag" @toRouterView="toRouterView"> </vue-office-header>
<div class="enterprise-wrap__body">
<div id="content" class="content">
<div class="content-body" :style="{ height: contentHeight }">
......
src/views/business/audit-log.vue
......@@ -28,7 +28,7 @@
</div>
</div>
</div>
<common-alert-tip :width="'284px'" :tipContent="tipContent"></common-alert-tip>
<common-alert-tip :width="'284px'" :tip-content="tipContent"></common-alert-tip>
</div>
<div class="m-t-20">
<el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }">
......@@ -100,7 +100,7 @@
</div>
</div>
</div>
<store-auth-detail v-if="logShow" :storeRangeAuditId="storeRangeAuditId" @closeLog="closeLog"></store-auth-detail>
<store-auth-detail v-if="logShow" :store-range-audit-id="storeRangeAuditId" @closeLog="closeLog"></store-auth-detail>
<!-- <vue-gic-footer></vue-gic-footer> -->
</div>
</template>
......
src/views/business/auth-merchant.vue
......@@ -35,12 +35,10 @@
</div>
<div class="cell-info">
<div class="cell-info-name flex font-14 color-303133">
<span class="gic-name">{{ scope.row.enterpriseName || '--' }}</span
><span class="gic-version">{{ scope.row.version || '--' }}</span>
<span class="gic-name">{{ scope.row.enterpriseName || '--' }}</span><span class="gic-version">{{ scope.row.version || '--' }}</span>
</div>
<div class="cell-info-name flex font-14 color-303133">
<span class="gic-name">{{ scope.row.brandName || '--' }}</span
>
<span class="gic-name">{{ scope.row.brandName || '--' }}</span>
</div>
</div>
</div>
......
src/views/business/contacts.vue
......@@ -22,7 +22,7 @@
</div>
<div class="help-body flex flex-space-between" @click="toRefreshMember"><span class="font-12 color-2f54eb">刷新企业成员</span><span class="font-12 color-2f54eb iconfont iconshuaxin1"></span></div>
<div class="left-tree p-t-14">
<contact-tree v-if="!searchInput" :departObj="departObj" :itemData="wxData" v-model="wxData" @getSelectData="getSelectData"></contact-tree>
<contact-tree v-if="!searchInput" :depart-obj="departObj" :item-data="wxData" v-model="wxData" @getSelectData="getSelectData"></contact-tree>
<div v-if="searchInput" class="contact-search-body">
<ul v-if="searchData.length">
<li class="contact-li" v-for="(item, index) in searchData" :key="index + 'gic'">
......@@ -40,13 +40,13 @@
</div>
<div class="apps-content-right">
<div class="content-right-body border-box" style="min-height: 100%;">
<new-depart-member :departObj="departObj" @changeDepart="changeDepart"></new-depart-member>
<new-depart-member :depart-obj="departObj" @changeDepart="changeDepart"></new-depart-member>
</div>
</div>
</div>
</div>
</div>
<sync-dialog v-if="syncStatusData.syncStatus == 1 || syncStatusData.syncStatus == 2 || syncStatusData.syncStatus == 3" :syncData="syncStatusData"></sync-dialog>
<sync-dialog v-if="syncStatusData.syncStatus == 1 || syncStatusData.syncStatus == 2 || syncStatusData.syncStatus == 3" :sync-data="syncStatusData"></sync-dialog>
<!-- <vue-gic-footer></vue-gic-footer> -->
</div>
</template>
......
src/views/business/index.vue
......@@ -9,7 +9,7 @@
<template>
<div class="enterprise-wrap">
<!-- 公共头部菜单 -->
<vue-office-header :projectName="projectName" @collapseTag="collapseTag" @toRouterView="toRouterView"> </vue-office-header>
<vue-office-header :project-name="projectName" @collapseTag="collapseTag" @toRouterView="toRouterView"> </vue-office-header>
<div class="enterprise-wrap__body">
<div id="content" class="content">
<div class="content-body" :style="{ height: contentHeight }">
......
src/views/business/new-auth-merchant.vue
......@@ -15,7 +15,7 @@
<div class="apps-content-right">
<div class="new-auth-body">
<div v-if="activeStep != 2">
<auth-step :activeStep="activeStep"></auth-step>
<auth-step :active-step="activeStep"></auth-step>
</div>
<div v-if="activeStep == 0" class="auth-tip-body">
<auth-tip class="m-t-30"></auth-tip>
......@@ -85,18 +85,18 @@
</div>
<!-- 审核员授权 -->
<div v-if="activeStep == 1" class="commit-success-body m-t-35">
<auth-commit :adminList="adminList" :reason="authForm.auditReason" @changeStep="changeStep" @returnStep="returnStep"></auth-commit>
<auth-commit :admin-list="adminList" :reason="authForm.auditReason" @changeStep="changeStep" @returnStep="returnStep"></auth-commit>
</div>
<!-- 已提交审核 -->
<div v-if="activeStep == 2" class="commit-success-body">
<auth-commit-success :enterpriseId="authForm.enterpriseId"></auth-commit-success>
<auth-commit-success :enterprise-id="authForm.enterpriseId"></auth-commit-success>
</div>
</div>
</div>
</div>
</div>
</div>
<store-auth-dialog v-if="setVisible" :enterpriseId="authForm.enterpriseId" :isSelectAll="isSelectAll" :selectMode="selectMode" :rangeData="rangeData" :bindType="bindType" @closeSet="closeSet"></store-auth-dialog>
<store-auth-dialog v-if="setVisible" :enterprise-id="authForm.enterpriseId" :is-select-all="isSelectAll" :select-mode="selectMode" :range-data="rangeData" :bind-type="bindType" @closeSet="closeSet"></store-auth-dialog>
<!-- <vue-gic-footer></vue-gic-footer> -->
</div>
</template>
......
src/views/business/sync-log.vue
......@@ -24,7 +24,7 @@
<el-option label="解绑" value="1"></el-option>
</el-select>
</div>
<common-alert-tip :width="'284px'" :tipContent="tipContent"></common-alert-tip>
<common-alert-tip :width="'284px'" :tip-content="tipContent"></common-alert-tip>
</div>
<div class="m-t-20">
<el-table class="select-table" ref="multipleTable" :data="tableBindData" tooltip-effect="dark" :style="{ width: '100%' }">
......@@ -89,7 +89,7 @@
</el-tab-pane>
<el-tab-pane label="通讯录刷新日志" name="second">
<div class="flex flex-space-between">
<common-alert-tip :width="'284px'" :tipContent="'仅保存近一年的日志'"></common-alert-tip>
<common-alert-tip :width="'284px'" :tip-content="'仅保存近一年的日志'"></common-alert-tip>
</div>
<div class="m-t-20">
<el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }">
......@@ -138,7 +138,7 @@
</div>
</div>
<!-- <vue-gic-footer></vue-gic-footer> -->
<fail-log v-if="logShow" :taskId="taskId" @closeLog="closeLog"></fail-log>
<fail-log v-if="logShow" :task-id="taskId" @closeLog="closeLog"></fail-log>
</div>
</template>
<script>
......
src/views/enterprise/admin-list.vue
......@@ -20,8 +20,7 @@
style="width: 277px"
clearable
v-model.trim="search"
@change="onSearch"
></el-input>
@change="onSearch"></el-input>
<el-button style="float: right" type="primary" @click="toEditAdmin">添加管理员</el-button>
<el-table style="margin-top: 20px" :data="adminList">
<el-table-column label="姓名" prop="staffName" :formatter="(row, col, val) => val || '--'"></el-table-column>
......@@ -44,8 +43,7 @@
:page-size="pager.pageSize"
:current-page="pager.currentPage"
@size-change="onSizeChange"
@current-change="onCurrentChange"
></dm-pagination>
@current-change="onCurrentChange"></dm-pagination>
</div>
</div>
</template>
......
src/views/enterprise/edit-admin.vue
......@@ -66,8 +66,8 @@
</el-form>
</div>
</div>
<select-admin :showAdminFlag="showAdminFlag" :selectAdmin="adminForm.adminList" @checkAdmins="checkAdmins"></select-admin>
<select-admin-store :showAuthFlag="showAuthFlag" :enterpriseId="enterpriseId" :selectMode="selectMode" :rangeData="rangeData" :bindType="2" @closeSet="closeSet"></select-admin-store>
<select-admin :show-admin-flag="showAdminFlag" :select-admin="adminForm.adminList" @checkAdmins="checkAdmins"></select-admin>
<select-admin-store :show-auth-flag="showAuthFlag" :enterprise-id="enterpriseId" :select-mode="selectMode" :range-data="rangeData" :bind-type="2" @closeSet="closeSet"></select-admin-store>
<!-- <vue-gic-footer></vue-gic-footer> -->
</div>
......
src/views/enterprise/edit-role.vue
......@@ -7,8 +7,7 @@
title="管理角色：查看区域或门店日常业务，进行一些经营性的管理工作。不必关联导购账号。"
:closable="false"
show-icon
style="margin-bottom: 30px;width: 572px"
></el-alert>
style="margin-bottom: 30px;width: 572px"></el-alert>
<el-form :model="roleData" :rules="roleDataRule" ref="roleData" label-width="140px">
<el-form-item label="角色名称" prop="roleName">
<el-input
......@@ -16,8 +15,7 @@
maxlength="20"
show-word-limit
style="width: 432px"
v-model.trim="roleData.roleName"
></el-input>
v-model.trim="roleData.roleName"></el-input>
</el-form-item>
<el-form-item label="权限配置" prop="menuIds">
<el-radio-group v-model="activeType" class="specter" size="small">
......
src/views/enterprise/edit-store-role.vue
......@@ -7,8 +7,7 @@
title="拥有门店的权限，能进行一些门店日常业务，如打标签，完成话务等。必须是导购账号"
:closable="false"
show-icon
style="width:572px"
></el-alert>
style="width:572px"></el-alert>
<el-form :model="roleData" :rules="roleDataRule" ref="roleData" style="margin-top: 30px" label-width="135px">
<el-form-item label="角色名称" prop="roleName">
<el-input :value="roleData.roleName" disabled style="width: 510px"></el-input>
......
src/views/enterprise/enterprise-set.vue
......@@ -18,8 +18,7 @@
<span class="font-14 color-303133">{{ companyObj.smallVersion || '免费版' }}</span>
</el-form-item>
<el-form-item label="企业名称">
<span class="font-14 color-303133 p-r-10">{{ companyObj.wxEnterpriseName || '--' }}</span> <el-tag> {{ companyObj.corpType == 'verified' ? '已认证' : '未认证' }}</el-tag
><span v-if="companyObj.corpType == 'verified'" class="p-l-10 font-12 color-909399">认证到期 {{ companyObj.verifiedEndTime | timeStampToYmd }}</span>
<span class="font-14 color-303133 p-r-10">{{ companyObj.wxEnterpriseName || '--' }}</span> <el-tag> {{ companyObj.corpType == 'verified' ? '已认证' : '未认证' }}</el-tag><span v-if="companyObj.corpType == 'verified'" class="p-l-10 font-12 color-909399">认证到期 {{ companyObj.verifiedEndTime | timeStampToYmd }}</span>
</el-form-item>
<el-form-item label="企业ID">
<span class="font-14 color-303133">{{ companyObj.corpId || '--' }}</span>
......@@ -55,9 +54,7 @@
<span class="font-14 color-303133">{{item.agentId}}</span>
</el-form-item>
<el-form-item label="Secret">
<span class="font-14 color-303133">{{item.secretVal}}</span><span class="p-l-15 font-14 color-303133"
><span :class="['iconfont', item.checkFlag ? 'color-49c958 iconchenggong' : 'color-f83431 iconshibai']"></span><span class="p-l-10">{{ item.checkFlag ? '校验成功' : '校验失败' }}</span></span
>
<span class="font-14 color-303133">{{item.secretVal}}</span><span class="p-l-15 font-14 color-303133"><span :class="['iconfont', item.checkFlag ? 'color-49c958 iconchenggong' : 'color-f83431 iconshibai']"></span><span class="p-l-10">{{ item.checkFlag ? '校验成功' : '校验失败' }}</span></span>
</el-form-item>
<el-form-item label="应用可见范围">
<span v-for="(child, key) in item.displayRange" :key="key+'child'" class="font-14 color-303133 inline-block">{{child.name}} {{ item.displayRange.length > 1 ? '；':''}}</span>
......@@ -70,7 +67,7 @@
</div>
</div>
</div>
<add-self-app v-if="addShow" :editRow="editRow" @closeText="closeText" @submitText="submitText"></add-self-app>
<add-self-app v-if="addShow" :edit-row="editRow" @closeText="closeText" @submitText="submitText"></add-self-app>
</div>
</template>
<script>
......
src/views/enterprise/index.vue
......@@ -8,7 +8,7 @@
-->
<template>
<div class="my-customer-wrap common-set-wrap">
<vue-office-header :projectName="projectName" @collapseTag="collapseTag" @toRouterView="toRouterView" @leftData="leftData"> </vue-office-header>
<vue-office-header :project-name="projectName" @collapseTag="collapseTag" @toRouterView="toRouterView" @leftData="leftData"> </vue-office-header>
<div class="enterprise-wrap__body">
<div id="content" class="content">
<div class="content-body">
......@@ -16,11 +16,11 @@
<div class="right-box" style="min-height: calc(100vh - 86px);">
<div class="apps-content flex" style="min-height: calc(100vh - 86px);">
<div class="apps-content-left w-157" style="min-height: calc(100vh - 86px)" v-show="showAsideMenu">
<common-detail-left :tabListData="tabListData" :activeSelTab="activeSelTab" @setSelectTab="setSelectTab"></common-detail-left>
<common-detail-left :tab-list-data="tabListData" :active-sel-tab="activeSelTab" @setSelectTab="setSelectTab"></common-detail-left>
</div>
<div class="apps-content-right border-box" :style="{width: showAsideMenu ? 'calc(100% - 157px)' : '100%',paddingLeft: showAsideMenu ? '10px': '0'}">
<transition name="fade" mode="out-in">
<router-view :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab" @showAsideMenu="show => showAsideMenu = show"></router-view>
<router-view :brand-id="activeBrand" :active-group-id="activeGroup" :tab-type="activeTab" @showTab="showTab" @showAsideMenu="show => showAsideMenu = show"></router-view>
</transition>
</div>
</div>
......
src/views/enterprise/store-admin-list.vue
......@@ -22,15 +22,13 @@
prefix-icon="el-icon-search"
clearable
v-model.trim="search"
@change="onSearch"
></el-input>
@change="onSearch"></el-input>
<el-alert
type="info"
title="拥有门店的权限，能进行一些门店日常业务，如打标签，完成话务等。必须是导购账号 ，不可添加删除门店成员。"
:closable="false"
show-icon
style="float:right;width:720px;"
></el-alert>
style="float:right;width:720px;"></el-alert>
<el-table style="margin-top:20px" :data="adminList">
<el-table-column label="姓名" prop="staffName" :formatter="(row, col, val) => val || '--'"></el-table-column>
<el-table-column label="账号" prop="wxUserId" :formatter="(row, col, val) => val || '--'"></el-table-column>
......@@ -46,8 +44,7 @@
:page-size="pager.pageSize"
:current-page="pager.currentPage"
@current-change="onCurrentChange"
@size-change="onSizeChange"
></dm-pagination>
@size-change="onSizeChange"></dm-pagination>
</div>
</div>
</template>
......
src/views/enterprise/super-admin.vue
......@@ -9,7 +9,7 @@
<template>
<div class="daily-set-wrap ">
<div class="daily-set-content border-box">
<common-alert-tip :tipContent="tipContent"></common-alert-tip>
<common-alert-tip :tip-content="tipContent"></common-alert-tip>
<div class="admin-table-body m-t-20">
<el-table ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" style="width: 100%">
<el-table-column label="姓名">
......
src/views/index/index.vue
......@@ -8,7 +8,7 @@
-->
<template>
<div id="index">
<vue-office-header ref="headerMenu" :projectName="projectName" @collapseTag="collapseTag" @toRouterView="toRouterView"> </vue-office-header>
<vue-office-header ref="headerMenu" :project-name="projectName" @collapseTag="collapseTag" @toRouterView="toRouterView"> </vue-office-header>
<div id="content" class="content">
<div class="content-body border-box" style="min-height: calc(100vh - 46px);">
<div class="index-body flex flex-row">
......@@ -96,8 +96,7 @@
<span class="w-86 font-14 color-909399 text-left" style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;">门店总数</span>
</el-tooltip>
</span>
<span class="font-14 color-303133 ">{{ versionData.storeTotal }}</span
><!-- <span v-if="versionData.storeTotal > versionData.storeNum" class=" cursor-pointer font-12 p-l-10 color-f5222d" @click="toOverStore">（{{ versionData.storeTotal - versionData.storeNum }}家门店溢出）</span> -->
<span class="font-14 color-303133 ">{{ versionData.storeTotal }}</span><!-- <span v-if="versionData.storeTotal > versionData.storeNum" class=" cursor-pointer font-12 p-l-10 color-f5222d" @click="toOverStore">（{{ versionData.storeTotal - versionData.storeNum }}家门店溢出）</span> -->
</div>
<!-- <div class="serve-btn text-center m-t-30">
<el-button type="primary" @click="goShopping">前往订购</el-button>
......
src/views/review-center/index.vue
......@@ -9,17 +9,17 @@
<template>
<div class="review-wrap">
<!-- 公共头部菜单 -->
<vue-office-header :projectName="projectName" @collapseTag="collapseTag" @toRouterView="toRouterView" @leftData="leftData"> </vue-office-header>
<vue-office-header :project-name="projectName" @collapseTag="collapseTag" @toRouterView="toRouterView" @leftData="leftData"> </vue-office-header>
<div class="setting-wrap__body">
<div id="content" class="content">
<div class="content-body">
<div class="content-body-inner flex border-box">
<div class="apps-content-left w-157" style="min-height: calc(100vh - 86px);">
<common-detail-left :tabListData="tabListData" :activeSelTab="activeSelTab" @setSelectTab="setSelectTab"></common-detail-left>
<common-detail-left :tab-list-data="tabListData" :active-sel-tab="activeSelTab" @setSelectTab="setSelectTab"></common-detail-left>
</div>
<div class="apps-content-right border-box">
<transition name="fade" mode="out-in">
<router-view :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"></router-view>
<router-view :brand-id="activeBrand" :active-group-id="activeGroup" :tab-type="activeTab" @showTab="showTab"></router-view>
</transition>
</div>
</div>
......
src/views/review-center/reviewed.vue
......@@ -21,8 +21,7 @@
</div>
<el-input class="w-344 " placeholder="请输入提交人姓名/账号/手机号" prefix-icon="el-icon-search" v-model="searchValue" clearable @clear="clearSearch" @keyup.native="value => searchEnterFun(value, searchInput)"> </el-input><el-select v-model="auditType" placeholder="全部事项" @change="changeTableList" class="w-130 m-l-10"> <el-option v-for="item in filterOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select><el-select class="w-168 m-l-10" v-model="filterBrand" placeholder="全部品牌" @change="changeTableList">
<el-option label="全部品牌" value=""></el-option>
<el-option v-for="item in brandOptions" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId"> </el-option> </el-select
>
<el-option v-for="item in brandOptions" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId"> </el-option> </el-select>
</div>
<div class="reviewed-body-content">
<el-table ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" style="width: 100%">
......@@ -129,7 +128,7 @@
</div>
</div>
<!-- 门店变更 -->
<storeChange v-model="showStoreDialog" :storeChangeData="storeChangeData"> </storeChange>
<store-change v-model="showStoreDialog" :store-change-data="storeChangeData"> </store-change>
</div>
</template>
<script>
......
src/views/review-center/unreview.vue
......@@ -12,8 +12,7 @@
<div class="right-box" style="min-height: calc(100vh - 86px)">
<div class="reviewed-body-head flex flex-space-between">
<div>
<el-input class="w-344 " placeholder="请输入提交人姓名/账号/手机号" prefix-icon="el-icon-search" v-model="searchValue" clearable @clear="clearSearch" @keyup.native="value => searchEnterFun(value, searchInput)"> </el-input><el-select v-model="auditType" placeholder="全部事项" @change="changeTableList" class="w-130 m-l-10"> <el-option v-for="item in filterOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select
><el-select v-model="filterBrand" placeholder="全部品牌" @change="changeTableList" class="w-168 m-l-10">
<el-input class="w-344 " placeholder="请输入提交人姓名/账号/手机号" prefix-icon="el-icon-search" v-model="searchValue" clearable @clear="clearSearch" @keyup.native="value => searchEnterFun(value, searchInput)"> </el-input><el-select v-model="auditType" placeholder="全部事项" @change="changeTableList" class="w-130 m-l-10"> <el-option v-for="item in filterOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select><el-select v-model="filterBrand" placeholder="全部品牌" @change="changeTableList" class="w-168 m-l-10">
<el-option label="全部品牌" value=""></el-option>
<el-option v-for="item in brandOptions" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId"> </el-option>
</el-select>
......@@ -100,7 +99,7 @@
</div>
</div>
<!-- 门店变更 -->
<storeChange v-model="showStoreDialog" :storeChangeData="storeChangeData"> </storeChange>
<store-change v-model="showStoreDialog" :store-change-data="storeChangeData"> </store-change>
<!-- 同意 -->
<el-dialog class="approve-dialog" title="" :visible.sync="approveVisible" width="422px">
<div class="approve-body text-center">
......@@ -127,7 +126,7 @@
<el-button type="primary" @click="sendRefuse('ruleForm')">确 定</el-button>
</div>
</el-dialog>
<review-result-detail :auditIds="auditIds" :detailShow="detailShow" @hideDetailDialog="hideDetailDialog"> </review-result-detail>
<review-result-detail :audit-ids="auditIds" :detail-show="detailShow" @hideDetailDialog="hideDetailDialog"> </review-result-detail>
<el-dialog title="提示" :visible.sync="dialogVisible" width="30%">
<span>共{{ multipleSelection.length }}条审核事项，是否批量同意?</span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment