Bladeren bron

Merge branch 'develop_yh56_1' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh56_1

# Conflicts:
#	public/version.json
lilei 3 maanden geleden
bovenliggende
commit
a42d2a36c0

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1742357396500
+  "version": 1742357443535
 }

+ 4 - 4
src/config/router.config.js

@@ -1955,8 +1955,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '连锁库存',
-              icon: 'alert'
-              // permission: 'M_chainInventoryList'
+              icon: 'alert',
+              permission: 'M_chainInventory'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1967,8 +1967,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '连锁库存列表',
                   hidden: true,
-                  icon: 'alert'
-                  // permission: 'M_chainInventoryList'
+                  icon: 'alert',
+                  permission: 'M_chainInventoryList'
                 }
               }
             ]

+ 5 - 5
src/views/inventoryManagement/chainInventory/list.vue

@@ -114,13 +114,13 @@ export default {
       linkageGroupData: [], // 门店列表
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '门店名称', dataIndex: 'dealerName', align: 'left', width: '20%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '门店名称', dataIndex: 'dealerName', align: 'center', width: '18%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', dataIndex: 'productCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productEntity.name', align: 'left', width: '20%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productEntity.origCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品品牌', dataIndex: 'productEntity.productBrandName', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productEntity.name', align: 'left', width: '23%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productEntity.origCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品品牌', dataIndex: 'productEntity.productBrandName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: '15%', align: 'center' },
-        { title: '可用库存数量(个)', dataIndex: 'currentStockQty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '可用库存数量(个)', dataIndex: 'currentStockQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 1 - 1
src/views/numsGoodsShelves/shelfSet/basicInfoModal.vue

@@ -31,7 +31,7 @@
           </template>
           <custList id="shelfSet-basicInfo-modal-custList" ref="custList" :isEnabled="true" @change="custChange"></custList>
         </a-form-model-item>
-        <a-form-model-item prop="showPrice" v-if="$hasPermissions('B_shelfSet_priceSetting')">
+        <a-form-model-item prop="showPrice">
           <template slot="label">
             <a-tooltip placement="top">
               <template slot="title">

+ 2 - 2
src/views/numsGoodsShelves/shelfSet/list.vue

@@ -84,7 +84,7 @@
             checkedChildren="启用"
             unCheckedChildren="停用"
             :disabled="record.state=='WRITE_OFF'||record.state=='SUSPEND'"
-            v-if="$hasPermissions('B_shelfSet_enable')&&record.state!=undefined"
+            v-if="record.state!=undefined"
             @change="enableShelf(record)"
             :checked="record.state == 'ENABLE'"
             :id="'shelfSetList-state-'+record.id"
@@ -102,7 +102,7 @@
               size="small"
               type="link"
               class="button-primary"
-              v-if="$hasPermissions('B_shelfSet_logout')&&record.state!='WRITE_OFF'&&record.state!='SUSPEND'"
+              v-if="record.state!='WRITE_OFF'&&record.state!='SUSPEND'"
               @click="handleCancel(record)">注销</a-button>
           </div>
         </template>