Jelajahi Sumber

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

1004749546@qq.com 3 tahun lalu
induk
melakukan
78602c8d77

+ 1 - 7
src/views/customerManagement/customerInfo/list.vue

@@ -109,13 +109,7 @@
             class="button-success"
             @click="handleDetail(record)"
             id="customerManagementList-detail-btn">详情</a-button>
-          <!-- <a-button
-            size="small"
-            v-if="$hasPermissions('B_customer_customerInfo_del') && record.satelliteFlag!=1"
-            type="link"
-            class="button-error"
-            @click="handleDel(record)"
-            id="customerManagementList-del-btn">删除</a-button> -->
+          <span v-if="!$hasPermissions('B_customer_customerInfo_edit') && !$hasPermissions('B_customer_customerInfo_detail')">--</span>
         </template>
         <template slot="enableAction" slot-scope="text, record">
           <a-switch v-if="$hasPermissions('B_customer_customerInfo_enable')" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.enabledFlag" @change="changeFlagHandle(text, record)"/>

+ 1 - 0
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -117,6 +117,7 @@
             class="button-warning"
             @click="goWarehouseDetail(record)"
             id="inventoryQueryList-warehouseDetail-btn">出入库明细</a-button>
+          <span v-if="!$hasPermissions('B_inventoryInventoryQueryDetail') && !$hasPermissions('B_inventoryInventoryQueryStock')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 2 - 1
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -97,7 +97,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :dataSource="loadData"
-        :scroll="{ x: 2120, y: tableHeight }"
+        :scroll="{ x: 2200, y: tableHeight }"
         :pagination="paginationProps"
         bordered>
         <!-- 产品分类 -->
@@ -160,6 +160,7 @@
             class="button-info"
             @click="handleSave(record)"
             id="inventoryWarningList-add-btn">保存</a-button>
+          <span v-if="!$hasPermissions('B_inventoryWarningSave')">--</span>
         </template>
       </a-table>
     </a-spin>

+ 1 - 0
src/views/inventoryManagement/satelliteWarehouseInventory/list.vue

@@ -53,6 +53,7 @@
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button size="small" v-if="$hasPermissions('B_satelliteWarehouseInventoryAdd')" type="link" @click="handleAdd(record)" id="satelliteWarehouseInventoryList-add-btn">加入补货单</a-button>
+          <span v-if="!$hasPermissions('B_satelliteWarehouseInventoryAdd')">--</span>
         </template>
       </a-table>
     </a-spin>

+ 1 - 0
src/views/inventoryManagement/warehouse/list.vue

@@ -55,6 +55,7 @@
             class="button-error"
             @click="handleDel(record)"
             id="warehouseList-del-btn">删除</a-button>
+          <span v-if="!$hasPermissions('M_inventoryWarehouseStoringLocationList') && !$hasPermissions('B_inventory_warehouse_edit') && !$hasPermissions('B_inventory_warehouse_del')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 1 - 0
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -56,6 +56,7 @@
               class="button-error"
               @click="handleDel(record)"
               id="storingLocationList-del-btn">删除</a-button>
+            <span v-if="!$hasPermissions('B_inventory_warehouse_storingLocation_edit') && !$hasPermissions('B_inventory_warehouse_storingLocation_del')">--</span>
           </template>
         </s-table>
       </a-card>

+ 1 - 1
src/views/productManagement/productCategory/list.vue

@@ -43,7 +43,7 @@
             icon="delete"
             id="productCategory-del"
             @click="handleDel(record)">删除</a-button>
-          <span v-if="record.sysFlag != 0">--</span>
+          <span v-if="!(record.productTypeLevel<3 && $hasPermissions('B_product_dealerProductType_add')&&record.sysFlag == 0) && !(record.pid != 0 && $hasPermissions('B_product_dealerProductType_edit')&&record.sysFlag == 0) && !(record.pid != 0 && $hasPermissions('B_product_dealerProductType_del')&&record.sysFlag == 0)">--</span>
         </template>
       </s-table>
     </a-spin>

+ 1 - 0
src/views/productManagement/productInfo/list.vue

@@ -120,6 +120,7 @@
             class="button-success"
             @click="handleDetail(record)"
             id="productInfoList-detail-btn">详情</a-button>
+          <span v-if="!$hasPermissions('B_product_dealerProduct_edit') && !$hasPermissions('B_product_dealerProduct_detail')">--</span>
         </template>
       </s-table>
     </a-spin>

+ 5 - 1
src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue

@@ -111,7 +111,11 @@ export default {
           const no = 0
           for (var i = 0; i < data.length; i++) {
             data[i].no = no + i + 1
-            data[i].address = data[i].provinceName + '-' + data[i].cityName + '-' + data[i].countyName + '-' + data[i].addr
+            const provinceName = data[i].provinceName ? (data[i].provinceName + '-') : ''
+            const cityName = data[i].cityName ? (data[i].cityName + '-') : ''
+            const countyName = data[i].countyName ? (data[i].countyName + '-') : ''
+            const addr = data[i].addr || ''
+            data[i].address = provinceName + cityName + countyName + addr
           }
           this.disabled = false
           return data