lilei 7 ヶ月 前
コミット
0f7b8dfe91

+ 2 - 27
src/config/router.config.js

@@ -3866,31 +3866,6 @@ export const asyncRouterMap = [
               }
             ]
           },
-          {
-            path: '/basicData/transferTypeManagement',
-            redirect: '/basicData/transferTypeManagement/list',
-            name: 'transferTypeManagement',
-            component: BlankLayout,
-            meta: {
-              title: '调拨类型管理',
-              icon: 'interaction',
-              permission: 'M_transferTypeManagementList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'transferTypeManagementList',
-                component: () => import(/* webpackChunkName: "basicData" */ '@/views/basicData/transferTypeManagement/list.vue'),
-                meta: {
-                  title: '调拨类型列表',
-                  icon: 'interaction',
-                  hidden: true,
-                  permission: 'M_transferTypeManagementList'
-                }
-              }
-            ]
-          }
         ]
       },
       // 权限管理
@@ -4120,7 +4095,7 @@ export const asyncRouterMap = [
             name: 'erpAllotSettings',
             component: BlankLayout,
             meta: {
-              title: 'ERP调拨配置',
+              title: '调拨类型管理',
               icon: 'sketch',
               permission: 'M_erpAllotMessage'
             },
@@ -4131,7 +4106,7 @@ export const asyncRouterMap = [
                 name: 'erpAllotSettingsList',
                 component: () => import(/* webpackChunkName: "setting" */ '@/views/setting/erpAllotSettings/list.vue'),
                 meta: {
-                  title: 'ERP调拨配置',
+                  title: '调拨类型管理',
                   icon: 'sketch',
                   hidden: true,
                   permission: 'M_erpAllotMessageList'

+ 2 - 1
src/views/setting/dataValidManagement/list.vue

@@ -133,7 +133,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '3.5%', align: 'center' },
         { title: '业务名称', dataIndex: 'bizName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '校验内容', dataIndex: 'checkContent', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '校验内容', dataIndex: 'validContent', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务编号', dataIndex: 'bizNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '校验结果', dataIndex: 'resultType', scopedSlots: { customRender: 'resultType' }, width: '6%', align: 'center' },
         { title: '错误信息', scopedSlots: { customRender: 'errInfo' }, width: '14%', align: 'center', ellipsis: true },
@@ -156,6 +156,7 @@ export default {
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
+              data.list[i].validContent = data.list[i].nodeName + ',' + data.list[i].checkContent
             }
             this.disabled = false
           }

+ 12 - 9
src/views/setting/erpAllotSettings/editModal.vue

@@ -19,8 +19,8 @@
           :label-col="formItemLayout.labelCol"
           :wrapper-col="formItemLayout.wrapperCol"
         >
-          <a-form-model-item label="类型">
-            {{ parentName }}
+          <a-form-model-item label="所属类型">
+            {{ nowData && nowData.parentName && nowData.parentName.join('>')||'--' }}
           </a-form-model-item>
           <a-form-model-item label="调拨类型名称" prop="name">
             <a-input
@@ -31,12 +31,13 @@
               placeholder="请输入调拨类型名称(最多30个字符)"
               allowClear />
           </a-form-model-item>
-          <a-form-model-item label="价格类型" prop="erpPriceType">
+          <a-form-model-item label="同步ERP价格类型" v-if="nowData && nowData.root==1">
             <v-select
               code="ERP_PRICE_TYPE"
               ref="erpPriceType"
               id="transferTypeManagementEdit-erpPriceType"
-              placeholder="请选择价格类型"
+              placeholder="请选择同步ERP价格类型"
+              clearable
               v-model="form.erpPriceType"
             ></v-select>
           </a-form-model-item>
@@ -77,10 +78,7 @@ export default {
   computed: {
     // 弹窗标题
     modalTit () {
-      return (this.itemSn ? '编辑' : this.nowData ? '添加子级' : '添加一级') + '调拨类型'
-    },
-    parentName () {
-      return this.nowData && this.nowData.superior ? this.nowData.superior.name : '--'
+      return (this.itemSn ? '编辑' : this.nowData ? '新增子级' : '添加一级') + '类型'
     }
   },
   data () {
@@ -155,8 +153,13 @@ export default {
         if (this.nowData) { //  编辑 或 添加子级
           this.form.name = this.nowData && this.nowData.name ? this.nowData.name : ''
           this.form.allocateCategory = this.nowData && this.nowData.allocateCategory ? this.nowData.allocateCategory : ''
-          this.form.erpPriceType = this.nowData && this.nowData.erpPriceType ? this.nowData.erpPriceType : undefined
           this.form.treeLevel = this.nowData && this.nowData.treeLevel ? this.nowData.treeLevel : ''
+          // 只有编辑叶子节点时显示价格类型
+          if (this.nowData.root == 1) {
+            this.form.erpPriceType = this.nowData && this.nowData.erpPriceType ? this.nowData.erpPriceType : undefined
+          } else {
+            this.form.erpPriceType = undefined
+          }
         } else { //  添加一级分类
           this.form.name = ''
           this.form.allocateCategory = 0

+ 23 - 15
src/views/setting/erpAllotSettings/list.vue

@@ -24,21 +24,12 @@
         :scroll="{ y: tableHeight }"
         :defaultLoadData="false"
         childrenColumnName="sonList"
-        :expandedRowKeys="expandedRowKeys"
         bordered>
         <template slot="titles" slot-scope="text, record">
           {{ record.name }}
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-success"
-            @click="handleEdit({allocateCategory:record.allocateTypeSn,treeLevel:record.treeLevel+1,superior:{name:record.name}})"
-            v-if="record.treeLevel != 3"
-            :id="'erpAllotSet-add-btn-'+record.id">新增子级类型</a-button>
-          <span style="color:#fff" v-else>———————-</span>
           <a-button
             size="small"
             type="link"
@@ -47,18 +38,25 @@
             v-if="$hasPermissions('B_transferTypeManagement_edit')"
             :id="'erpAllotSet-edit-btn-'+record.id">编辑</a-button>
           <a-button
+            size="small"
+            type="link"
+            class="button-success"
+            @click="handleEdit({root:1,allocateCategory:record.allocateTypeSn,treeLevel:record.treeLevel+1,superior:{name:record.name,parentSn:record.parentSn}})"
+            v-if="record.treeLevel != 3"
+            :id="'erpAllotSet-add-btn-'+record.id">新增子级</a-button>
+          <!-- <a-button
             size="small"
             type="link"
             class="button-error"
             @click="handleDel(record)"
             v-if="record.root==1 && $hasPermissions('B_transferTypeManagement_del')"
-            :id="'erpAllotSet-del-btn-'+record.id">删除</a-button>
+            :id="'erpAllotSet-del-btn-'+record.id">删除</a-button> -->
         </template>
         <template slot="createDate" slot-scope="text, record">
-          {{ record.createDate }}
+          {{ record.updateDate }}
         </template>
         <template slot="priceType" slot-scope="text, record">
-          {{ record.erpPriceTypeDictValue }}
+          {{ record.root==1 ? record.erpPriceTypeDictValue : '' }}
         </template>
       </s-table>
     </a-spin>
@@ -84,9 +82,9 @@ export default {
       tableHeight: 0, // 表格高度
       // 表头
       columns: [
-        { title: '调拨类型', scopedSlots: { customRender: 'titles' }, width: '60%', align: 'left' },
-        { title: '创建时间', scopedSlots: { customRender: 'createDate' }, width: '20%', align: 'center' },
-        { title: '价格类型', scopedSlots: { customRender: 'priceType' }, width: '20%', align: 'center' },
+        { title: '费用/调拨类型', scopedSlots: { customRender: 'titles' }, width: '60%', align: 'left' },
+        { title: '同步ERP价格类型', scopedSlots: { customRender: 'priceType' }, width: '20%', align: 'center' },
+        { title: '更新时间', scopedSlots: { customRender: 'createDate' }, width: '20%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '20%', align: 'left' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -120,6 +118,16 @@ export default {
       console.log(row)
       this.itemSn = row && row.allocateTypeSn ? row.allocateTypeSn : null
       this.nowData = row
+      if (row) {
+        this.nowData.parentName = row.treeLevel == 1 ? [] : [row.superior && row.superior.name]
+        if (row.treeLevel > 2) {
+          const pnode = this.allData.find(item => item.allocateTypeSn == row.superior.parentSn)
+          console.log(pnode)
+          if (pnode) {
+            this.nowData.parentName.unshift(pnode.name)
+          }
+        }
+      }
       this.openModal = true
     },
     //  删除