浏览代码

bug修复

chenrui 4 年之前
父节点
当前提交
38a05b76b1
共有 3 个文件被更改,包括 19 次插入4 次删除
  1. 二进制
      src/assets/logo.png
  2. 16 1
      src/views/BasicSettings/StoreManagement.vue
  3. 3 3
      src/views/BasicSettings/StoreModal.vue

二进制
src/assets/logo.png


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

@@ -56,7 +56,12 @@
       :data="loadData"
       bordered>
       <!-- 组织机构 -->
-      <template slot="orgCode" slot-scope="text, record">{{ record.orgPCodeName }}{{ record.orgCodeName }}</template>
+      <template slot="orgCode" slot-scope="text, record">
+        <span v-for="(item, index) in record.codeNameArr" :key="index">
+          {{ item }}
+          <strong v-if="index != record.codeNameArr.length-1">></strong>
+        </span>
+      </template>
       <!-- 负责人名称 -->
       <template slot="managerName" slot-scope="text, record">
         <div v-if="record.managerName">{{ record.managerName }}</div>
@@ -128,6 +133,16 @@ export default {
             for (let i = 0; i < res.data.list.length; i++) {
               const _item = res.data.list[i]
               _item.no = no + i + 1
+              // 重组组织机构
+              let codeNameArr = []
+              if (_item.orgPCodeName) { //  父级组织机构名称
+                const orgPCodeNameArr = _item.orgPCodeName.split(',')
+                codeNameArr = orgPCodeNameArr.splice(0, orgPCodeNameArr.length - 1)
+              }
+              if (_item.orgCodeName) { //  当前组织机构名称
+                codeNameArr.push(_item.orgCodeName)
+              }
+              _item.codeNameArr = codeNameArr
             }
             return res.data
           }

+ 3 - 3
src/views/BasicSettings/StoreModal.vue

@@ -116,6 +116,7 @@ export default {
       },
       treeData: [], //  组织机构
       parentCodePaths: '', //  机构编码父路径
+      orgPid: '', //  父级id
       storeInfo: null //  门店详情
     }
   },
@@ -134,9 +135,6 @@ export default {
       findOrgTree().then(res => {
         if (res.status == 200) {
           this.treeData = res.data
-          if (this.treeData.length > 0) {
-            this.treeData[0].disabled = true
-          }
         } else {
           this.treeData = []
         }
@@ -145,6 +143,7 @@ export default {
     //  组织归属  change
     treeChange (value, label, extra) {
       this.parentCodePaths = extra.triggerNode.$options.propsData.dataRef.parentCodePaths
+      this.orgPid = extra.triggerNode.$options.propsData.dataRef.pid
     },
     //  保存
     onSubmit () {
@@ -154,6 +153,7 @@ export default {
           const formData = JSON.parse(JSON.stringify(_this.form))
           formData.id = this.storeId
           formData.orgCodePaths = this.parentCodePaths
+          formData.orgPid = this.orgPid
           saveStoreOrg(formData).then(res => {
             if (res.status == 200) {
               _this.$message.success(res.message)