Browse Source

bug 修复

lilei 2 years ago
parent
commit
9cd3388bf4

+ 1 - 1
public/version.json

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

+ 4 - 4
src/views/basicData/bulkPartsTypeManagement/list.vue

@@ -19,23 +19,23 @@
         bordered>
         bordered>
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
-          <!-- 系统内置类型不可编辑和删除  tenantId为0是内置 -->
+          <!-- 系统内置类型不可编辑和删除  sysFlag为0是自建 -->
           <a-button
           <a-button
-            v-if="$hasPermissions('B_basicData_bulkPartsType_edit') && record.tenantId!=0"
+            v-if="$hasPermissions('B_basicData_bulkPartsType_edit') && record.sysFlag==0"
             size="small"
             size="small"
             type="link"
             type="link"
             class="button-primary"
             class="button-primary"
             @click="handleEdit(record)"
             @click="handleEdit(record)"
             id="bulkPartsTypeList-edit-btn">编辑</a-button>
             id="bulkPartsTypeList-edit-btn">编辑</a-button>
           <a-button
           <a-button
-            v-if="$hasPermissions('B_basicData_bulkPartsType_del') && record.tenantId!=0"
+            v-if="$hasPermissions('B_basicData_bulkPartsType_del') && record.sysFlag==0"
             size="small"
             size="small"
             type="link"
             type="link"
             class="button-error"
             class="button-error"
             @click="handleDel(record)"
             @click="handleDel(record)"
             id="bulkPartsTypeList-del-btn"
             id="bulkPartsTypeList-del-btn"
             style="margin: 0 0 0 8px;">删除</a-button>
             style="margin: 0 0 0 8px;">删除</a-button>
-          <span v-if="!($hasPermissions('B_basicData_bulkPartsType_edit') && record.tenantId!=0) && !($hasPermissions('B_basicData_bulkPartsType_del') && record.tenantId!=0)">--</span>
+          <span v-if="!($hasPermissions('B_basicData_bulkPartsType_edit') && record.sysFlag==0) && !($hasPermissions('B_basicData_bulkPartsType_del') && record.sysFlag==0)">--</span>
         </template>
         </template>
       </s-table>
       </s-table>
     </a-spin>
     </a-spin>

+ 4 - 4
src/views/basicData/customerTypeManagement/list.vue

@@ -35,22 +35,22 @@
         bordered>
         bordered>
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
-          <!-- 系统内置类型不可编辑和删除  tenantId为0是内置 -->
+          <!-- 系统内置类型不可编辑和删除  sysFlag为1是内置 -->
           <a-button
           <a-button
             size="small"
             size="small"
-            v-if="$hasPermissions('B_basicData_customerType_edit') && record.tenantId!=0"
+            v-if="$hasPermissions('B_basicData_customerType_edit') && record.sysFlag==0"
             type="link"
             type="link"
             class="button-primary"
             class="button-primary"
             @click="handleEdit(record)"
             @click="handleEdit(record)"
             id="customerTypeList-edit-btn">编辑</a-button>
             id="customerTypeList-edit-btn">编辑</a-button>
           <a-button
           <a-button
             size="small"
             size="small"
-            v-if="$hasPermissions('B_basicData_customerType_del') && record.tenantId!=0"
+            v-if="$hasPermissions('B_basicData_customerType_del') && record.sysFlag==0"
             type="link"
             type="link"
             class="button-error"
             class="button-error"
             @click="handleDel(record)"
             @click="handleDel(record)"
             id="customerTypeList-del-btn">删除</a-button>
             id="customerTypeList-del-btn">删除</a-button>
-          <span v-if="!($hasPermissions('B_basicData_customerType_edit') && record.tenantId!=0) && !($hasPermissions('B_basicData_customerType_del') && record.tenantId!=0)">--</span>
+          <span v-if="!($hasPermissions('B_basicData_customerType_edit') && record.sysFlag==0) && !($hasPermissions('B_basicData_customerType_del') && record.sysFlag==0)">--</span>
         </template>
         </template>
       </s-table>
       </s-table>
     </a-spin>
     </a-spin>

+ 4 - 4
src/views/basicData/expenseType/list.vue

@@ -21,7 +21,7 @@
         bordered>
         bordered>
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
-          <!-- 系统内置类型不可编辑和删除  tenantId为0是内置 -->
+          <!-- 系统内置类型不可编辑和删除  sysFlag为0是自建 -->
           <a-button
           <a-button
             v-if="record.typeLevel<3 && $hasPermissions('B_basicData_expenseType_add')"
             v-if="record.typeLevel<3 && $hasPermissions('B_basicData_expenseType_add')"
             type="link"
             type="link"
@@ -31,7 +31,7 @@
             id="expenseType-addSubItem"
             id="expenseType-addSubItem"
             @click="handleAdd(record)">新增子级</a-button>
             @click="handleAdd(record)">新增子级</a-button>
           <a-button
           <a-button
-            v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_edit') && record.tenantId!=0"
+            v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_edit') && record.sysFlag==0"
             type="link"
             type="link"
             class="button-primary"
             class="button-primary"
             size="small"
             size="small"
@@ -39,14 +39,14 @@
             id="expenseType-edit"
             id="expenseType-edit"
             @click="handleEdit(record)">编辑</a-button>
             @click="handleEdit(record)">编辑</a-button>
           <a-button
           <a-button
-            v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_del') && record.tenantId!=0"
+            v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_del') && record.sysFlag==0"
             type="link"
             type="link"
             class="button-error"
             class="button-error"
             size="small"
             size="small"
             icon="delete"
             icon="delete"
             id="expenseType-del"
             id="expenseType-del"
             @click="handleDel(record)">删除</a-button>
             @click="handleDel(record)">删除</a-button>
-          <span v-if="!(record.typeLevel<3 && $hasPermissions('B_basicData_expenseType_add')) && !(record.pid != 0 && $hasPermissions('B_basicData_expenseType_edit') && record.tenantId!=0) && !(record.pid != 0 && $hasPermissions('B_basicData_expenseType_del') && record.tenantId!=0)">--</span>
+          <span v-if="!(record.typeLevel<3 && $hasPermissions('B_basicData_expenseType_add')) && !(record.pid != 0 && $hasPermissions('B_basicData_expenseType_edit') && record.sysFlag==0) && !(record.pid != 0 && $hasPermissions('B_basicData_expenseType_del') && record.sysFlag==0)">--</span>
         </template>
         </template>
       </s-table>
       </s-table>
     </a-spin>
     </a-spin>

+ 4 - 4
src/views/basicData/storeTransferOutTypeManagement/list.vue

@@ -24,22 +24,22 @@
         bordered>
         bordered>
         <!-- 操作 -->
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
         <template slot="action" slot-scope="text, record">
-          <!-- 系统内置类型不可编辑和删除  tenantId为0是内置 -->
+          <!-- 系统内置类型不可编辑和删除  sysFlag为0是自建 -->
           <a-button
           <a-button
-            v-if="$hasPermissions('B_basicData_storeTransferOutType_edit') && record.tenantId!=0"
+            v-if="$hasPermissions('B_basicData_storeTransferOutType_edit') && record.sysFlag==0"
             size="small"
             size="small"
             type="link"
             type="link"
             class="button-primary"
             class="button-primary"
             @click="handleEdit(record)"
             @click="handleEdit(record)"
             id="storeTransferOutTypeList-edit-btn">编辑</a-button>
             id="storeTransferOutTypeList-edit-btn">编辑</a-button>
           <a-button
           <a-button
-            v-if="$hasPermissions('B_basicData_storeTransferOutType_del') && record.tenantId!=0"
+            v-if="$hasPermissions('B_basicData_storeTransferOutType_del') && record.sysFlag==0 "
             size="small"
             size="small"
             type="link"
             type="link"
             class="button-error"
             class="button-error"
             @click="handleDel(record)"
             @click="handleDel(record)"
             id="storeTransferOutTypeList-del-btn">删除</a-button>
             id="storeTransferOutTypeList-del-btn">删除</a-button>
-          <span v-if="!($hasPermissions('B_basicData_storeTransferOutType_edit') && record.tenantId!=0) && !($hasPermissions('B_basicData_storeTransferOutType_del') && record.tenantId!=0)">--</span>
+          <span v-if="!($hasPermissions('B_basicData_storeTransferOutType_edit') && record.sysFlag==0) && !($hasPermissions('B_basicData_storeTransferOutType_del') && record.sysFlag==0)">--</span>
         </template>
         </template>
       </s-table>
       </s-table>
     </a-spin>
     </a-spin>