chenrui 4 years ago
parent
commit
2545a5fc29

+ 11 - 18
src/views/BasicSettings/Organization.vue

@@ -1,7 +1,7 @@
 <template>
   <a-card class="organization-wrap" :bordered="false">
     <!-- 新建 -->
-    <div class="table-operator"><a-button id="organization-add" type="primary" icon="plus" @click="addOrg()" v-hasPermission="'B_basicSettings_organization_add'">添加最高级</a-button></div>
+    <div class="table-operator"><a-button id="organization-add" type="primary" icon="plus" @click="addOrg()" v-hasPermission="'B_basicSettings_organization_add'">新增最高级</a-button></div>
     <!-- 表格列表 -->
     <s-table
       class="s-table"
@@ -23,8 +23,9 @@
           class="btn-add-s"
           id="organization-addSubItem"
           @click="addOrg(text)"
-          v-hasPermission="'B_basicSettings_organization_add_child'">添加子级</a-button>
+          v-hasPermission="'B_basicSettings_organization_add_child'">新增子级</a-button>
         <a-button
+          v-if="record.pid != 0"
           type="link"
           size="small"
           icon="edit"
@@ -33,6 +34,7 @@
           @click="editOrg(text)"
           v-hasPermission="'B_basicSettings_organization_edit'">编辑</a-button>
         <a-button
+          v-if="record.pid != 0"
           type="link"
           size="small"
           icon="delete"
@@ -42,7 +44,7 @@
           v-hasPermission="'B_basicSettings_organization_del'">删除</a-button>
       </template>
     </s-table>
-    <!-- 添加子级 -->
+    <!-- 新增子级 -->
     <a-modal
       class="organization-modal"
       :title="title"
@@ -54,7 +56,7 @@
       <!-- 表单 -->
       <a-form-model ref="ruleForm" :model="form" :rules="rules">
         <a-form-model-item label="组织机构名称" prop="name">
-          <a-input v-model.trim="form.name" id="organization-itemName" :maxLength="30" placeholder="请输入组织机构名称,30个字以内" />
+          <a-input v-model.trim="form.name" @input="removeSpaces('name')" id="organization-itemName" :maxLength="30" placeholder="请输入组织机构名称(最多30个字符)" />
         </a-form-model-item>
         <a-form-model-item class="btn-cont">
           <a-button type="primary" id="organization-save" @click="onSubmit">保存</a-button>
@@ -92,28 +94,19 @@ export default {
         name: ''
       },
       rules: { //  表单校验规则
-        name: [{ required: true, message: '请输入组织机构名称', trigger: 'blur' }]
+        name: [{ required: true, message: '请输入组织机构名称', trigger: 'blur', whitespace: true }]
       },
       nowId: '', //  当前操作的数据id
       nowPid: '', //  当前操作的数据上级id
       defaultExpandedRowKeys: [] //  树形数据默认展开项
     }
   },
-  mounted () {
-    this.getList()
-  },
   methods: {
-    getList () {
-      findOrgTree().then(res => {
-        if (res.status == 200) {
-          //  递归去除空children
-          this.recursionFun(res.data)
-          this.listData = res.data
-          this.defaultExpandedRowKeys[0] = this.listData[0].id
-        }
-      })
+    //  去除空格
+    removeSpaces (val) {
+      this.form[val] = this.form[val].replace(/\s|\r\n|\n|<|>/g, '')
     },
-    //  添加子级
+    //  新增子级
     addOrg (item) {
       this.nowId = ''
       this.form.name = ''

+ 1 - 1
src/views/BasicSettings/StoreManagement.vue

@@ -81,7 +81,7 @@
           v-hasPermission="'B_basicSettings_store_edit'" />
         <a-icon
           type="link"
-          title="设置"
+          title="关联摄像设备"
           id="store-set"
           @click="setEquipment(record)"
           :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }"

+ 11 - 9
src/views/BasicSettings/StoreModal.vue

@@ -19,39 +19,41 @@
       <a-row :gutter="20" v-if="storeInfo">
         <a-col :span="8" class="item-w">
           <div class="item-label">门店名称:</div>
-          <div class="item-cont">{{ storeInfo.name }}</div>
+          <div class="item-cont">{{ storeInfo.name ? storeInfo.name : '--' }}</div>
         </a-col>
         <a-col :span="8" class="item-w">
           <div class="item-label">门店负责人:</div>
-          <div class="item-cont">{{ storeInfo.managerName }}</div>
+          <div class="item-cont">{{ storeInfo.managerName ? storeInfo.managerName : '--' }}</div>
         </a-col>
         <a-col :span="8" class="item-w">
           <div class="item-label">负责人手机:</div>
-          <div class="item-cont">{{ storeInfo.managerMobile }}</div>
+          <div class="item-cont">{{ storeInfo.managerMobile ? storeInfo.managerMobile : '--' }}</div>
         </a-col>
         <a-col :span="24" class="item-w">
           <div class="item-label">门店地址:</div>
-          <div class="item-cont">{{ storeInfo.addrProvinceName }}{{ storeInfo.addrCityName }}{{ storeInfo.addrDistrictName }}{{ storeInfo.addrDetail }}</div>
+          <div class="item-cont" v-if="!storeInfo.addrProvinceName && !storeInfo.addrCityName && !storeInfo.addrDistrictName && !storeInfo.addrDetail">--</div>
+          <div class="item-cont" v-else>{{ storeInfo.addrProvinceName }}{{ storeInfo.addrCityName }}{{ storeInfo.addrDistrictName }}{{ storeInfo.addrDetail }}</div>
         </a-col>
         <a-col :span="8" class="item-w">
           <div class="item-label">纬度:</div>
-          <div class="item-cont">{{ storeInfo.lat }}</div>
+          <div class="item-cont">{{ storeInfo.lat ? storeInfo.lat : '--' }}</div>
         </a-col>
         <a-col :span="8" class="item-w">
           <div class="item-label">经度:</div>
-          <div class="item-cont">{{ storeInfo.lng }}</div>
+          <div class="item-cont">{{ storeInfo.lng ? storeInfo.lng : '--' }}</div>
         </a-col>
         <a-col :span="8" class="item-w">
           <div class="item-label">营业时间:</div>
-          <div class="item-cont">{{ storeInfo.beginTime }} - {{ storeInfo.endTime }}</div>
+          <div class="item-cont" v-if="!storeInfo.beginTime && !storeInfo.endTime">--</div>
+          <div class="item-cont" v-else>{{ storeInfo.beginTime }} - {{ storeInfo.endTime }}</div>
         </a-col>
         <a-col :span="8" class="item-w">
           <div class="item-label">是否自营:</div>
-          <div class="item-cont">{{ storeInfo.selfFlagDictValue }}</div>
+          <div class="item-cont">{{ storeInfo.selfFlagDictValue ? storeInfo.selfFlagDictValue : '--' }}</div>
         </a-col>
         <a-col :span="8" class="item-w">
           <div class="item-label">启用状态:</div>
-          <div class="item-cont">{{ storeInfo.isEnableDictValue }}</div>
+          <div class="item-cont">{{ storeInfo.isEnableDictValue ? storeInfo.isEnableDictValue : '--' }}</div>
         </a-col>
         <a-col :span="8">
           <a-form-model-item class="form-label" label="组织归属" prop="orgCode" :label-col="{ span: 7 }" :wrapper-col="{ span: 17 }">