chenrui 4 years ago
parent
commit
bcfd00714f

+ 28 - 6
package-lock.json

@@ -1148,6 +1148,22 @@
       "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
       "dev": true
     },
+    "@simonwep/pickr": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/@simonwep/pickr/-/pickr-1.7.4.tgz",
+      "integrity": "sha512-fq7jgKJT21uWGC1mARBHvvd1JYlEf93o7SuVOB4Lr0x/2UPuNC9Oe9n/GzVeg4oVtqMDfh1wIEJpsdOJEZb+3g==",
+      "requires": {
+        "core-js": "^3.6.5",
+        "nanopop": "^2.1.0"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "3.6.5",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+          "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
+        }
+      }
+    },
     "@soda/friendly-errors-webpack-plugin": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.1.tgz",
@@ -2313,12 +2329,13 @@
       "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
     },
     "ant-design-vue": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.5.2.tgz",
-      "integrity": "sha512-DmlOl+ld4hSQdEG1c2wAV+v9/Bl2aG+wBEnd1GJYV0LeOXaSrBGiIkZrmUrTrUL92yBdFO+OF25aFNb0UFMZOA==",
+      "version": "1.6.5",
+      "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.6.5.tgz",
+      "integrity": "sha512-FzLrK+JuJUq+g4vd+UjFFi13ZdSsb11EZFapisFXilJxpc1LxqyunZu5AP4nr9vFLs3J4UX2A6q+Rp/Fi6JrLg==",
       "requires": {
         "@ant-design/icons": "^2.1.1",
         "@ant-design/icons-vue": "^2.0.0",
+        "@simonwep/pickr": "~1.7.0",
         "add-dom-event-listener": "^1.0.2",
         "array-tree-filter": "^2.1.0",
         "async-validator": "^3.0.3",
@@ -2571,9 +2588,9 @@
       "dev": true
     },
     "async-validator": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-3.3.0.tgz",
-      "integrity": "sha512-cAHGD9EL8aCqWXjnb44q94MWiDFzUo1tMhvLb2WzcpWqGiKugsjWG9cvl+jPgkPca7asNbsBU3fa0cwkI/P+Xg=="
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-3.4.0.tgz",
+      "integrity": "sha512-VrFk4eYiJAWKskEz115iiuCf9O0ftnMMPXrOFMqyzGH2KxO7YwncKyn/FgOOP+0MDHMfXL7gLExagCutaZGigA=="
     },
     "asynckit": {
       "version": "0.4.0",
@@ -11878,6 +11895,11 @@
         }
       }
     },
+    "nanopop": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/nanopop/-/nanopop-2.1.0.tgz",
+      "integrity": "sha512-jGTwpFRexSH+fxappnGQtN9dspgE2ipa1aOjtR24igG0pv6JCxImIAmrLRHX+zUF5+1wtsFVbKyfP51kIGAVNw=="
+    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",

+ 1 - 1
package.json

@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@antv/data-set": "^0.10.2",
-    "ant-design-vue": "^1.5.2",
+    "ant-design-vue": "^1.6.5",
     "axios": "^0.19.0",
     "core-js": "2.6.9",
     "enquire.js": "^2.1.6",

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

@@ -65,6 +65,8 @@
       :columns="columns"
       :data="loadData"
       bordered>
+      <!-- 组织机构 -->
+      <template slot="orgCode" slot-scope="text, record">{{ record.orgPCodeName }}{{ record.orgCodeName }}</template>
       <!-- 门店类型 -->
       <template slot="typeDictValue" slot-scope="text, record">
         <div v-if="record.typeDictValue">{{ record.typeDictValue }}</div>
@@ -127,7 +129,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 150, align: 'center' },
-        { title: '组织机构', dataIndex: 'orgCodeName', width: 120, align: 'center' },
+        { title: '组织机构', scopedSlots: { customRender: 'orgCode' }, width: 150, align: 'center' },
         { title: '门店名称', dataIndex: 'name', width: 120, align: 'center' },
         { title: '门店类型', scopedSlots: { customRender: 'typeDictValue' }, width: 80, align: 'center' },
         { title: '负责人名称', scopedSlots: { customRender: 'managerName' }, width: 100, align: 'center' },

+ 8 - 20
src/views/BasicSettings/StoreModal.vue

@@ -65,8 +65,8 @@
               style="width: 100%"
               :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
               :tree-data="treeData"
+              :replace-fields="{children:'children', title:'name', key:'id', value: 'code' }"
               placeholder="请选择组织归属"
-              treeNodeFilterProp="title"
               @change="treeChange">
             </a-tree-select>
           </a-form-model-item>
@@ -86,6 +86,8 @@
 import { Tree } from '@/components'
 import { findStoreDetail, saveStoreOrg } from '@/api/store.js'
 import { findOrgTree } from '@/api/atorg.js'
+import { TreeSelect } from 'ant-design-vue'
+const SHOW_ALL = TreeSelect.SHOW_ALL
 export default {
   components: { Tree },
   name: 'StoreModal',
@@ -103,6 +105,7 @@ export default {
   },
   data () {
     return {
+      SHOW_ALL,
       isShow: this.openModal, //  弹框是否展示
       form: { //  编辑
         orgCode: null //  机构编码
@@ -129,30 +132,15 @@ export default {
     getOrgList () {
       findOrgTree().then(res => {
         if (res.status == 200) {
-          this.treeData = this.recursionFun(res.data)
+          this.treeData = res.data
+          if (this.treeData.length > 0) {
+            this.treeData[0].disabled = true
+          }
         } else {
           this.treeData = []
         }
       })
     },
-    //  递归函数
-    recursionFun (data) {
-      if (data) {
-        data.map(item => {
-          if (item.children && item.children.length == 0) {
-            item.key = item.id ? 'org' + item.id : ''
-            item.value = item.code ? item.code : ''
-            item.title = item.name ? item.name : ''
-          } else {
-            item.key = item.id ? 'org' + item.id : ''
-            item.value = item.code ? item.code : ''
-            item.title = item.name ? item.name : ''
-            this.recursionFun(item.children)
-          }
-        })
-      }
-      return data
-    },
     //  组织归属  change
     treeChange (value, label, extra) {
       this.parentCodePaths = extra.triggerNode.$options.propsData.dataRef.parentCodePaths