lilei 2 年之前
父節點
當前提交
a6b675d433

+ 1 - 1
public/version.json

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

+ 4 - 4
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -113,7 +113,7 @@
             可用库存总成本:<strong>{{ currentStock&&(currentStock.totalCurrentStockCost || currentStock.totalCurrentStockCost==0) ? toThousands(currentStock.totalCurrentStockCost) : '--' }}</strong>。
           </div>
           <div style="display: inline-block;color:#f30f30;margin-left: 60px;" >
-            注意:购物车仅限添加箭冠产品。
+            注意:购物车仅限添加箭冠已上线产品。
           </div>
         </div>
       </a-alert>
@@ -121,7 +121,7 @@
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+68.5+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :columns="columns"
@@ -156,7 +156,7 @@
             class="button-primary"
             @click="goWarehouseDetail(record)"
             id="inventoryQueryList-warehouseDetail-btn">出入库明细</a-button>
-          <a-button v-if="record.dealerProduct.sysFlag==1&&$hasPermissions('M_shoppingCart')" type="link" @click="addShopCar(record)">加入购物车</a-button>
+          <a-button v-if="record.dealerProduct.sysFlag==1&&record.dealerProduct.onlineFalg==1&&$hasPermissions('M_shoppingCart')" type="link" @click="addShopCar(record)">加入购物车</a-button>
           <span v-if="!$hasPermissions('B_inventoryInventoryQueryDetail') && !$hasPermissions('B_inventoryInventoryQueryStock')">--</span>
         </template>
       </s-table>
@@ -477,7 +477,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230
+      this.tableHeight = window.innerHeight - tableSearchH - 216
     }
   },
   watch: {

+ 23 - 23
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -62,32 +62,32 @@
             </a-col>
           </a-row>
         </a-form>
-      </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button type="primary" v-if="$hasPermissions('B_inventoryWarningBatchSave')" id="inventoryWarningList-update" @click="handleupdate">批量更新</a-button>
-        <a-button
-          type="primary"
-          style="margin-left: 5px"
-          class="button-warning"
-          @click="openGuideModal=true"
-          v-if="$hasPermissions('B_inventoryWarningProductImport')"
-          id="inventoryWarningList-import-btn">导入产品</a-button>
-        <span style="margin-left: 5px" v-if="$hasPermissions('B_inventoryWarningBatchSave')">
-          <template v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
-        </span>
-      </div>
-      <!-- 合计 -->
-      <a-alert type="info" style="margin-bottom:10px">
-        <div class="ftext" slot="message" style="color:#f30f30;">
-          注意:购物车仅限添加箭冠产品。
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button type="primary" v-if="$hasPermissions('B_inventoryWarningBatchSave')" id="inventoryWarningList-update" @click="handleupdate">批量更新</a-button>
+          <a-button
+            type="primary"
+            style="margin-left: 5px"
+            class="button-warning"
+            @click="openGuideModal=true"
+            v-if="$hasPermissions('B_inventoryWarningProductImport')"
+            id="inventoryWarningList-import-btn">导入产品</a-button>
+          <span style="margin-left: 5px" v-if="$hasPermissions('B_inventoryWarningBatchSave')">
+            <template v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
+          </span>
         </div>
-      </a-alert>
+        <!-- 合计 -->
+        <a-alert type="info" style="margin-bottom:10px">
+          <div class="ftext" slot="message" style="color:#f30f30;">
+            注意:购物车仅限添加箭冠已上线产品。
+          </div>
+        </a-alert>
+      </div>
       <!-- 列表 -->
       <s-table
         class="sTable fixPagination"
         ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
+        :style="{ height: tableHeight+68.5+'px' }"
         size="small"
         :rowKey="(record) => record.id"
         :row-selection="$hasPermissions('B_inventoryWarningBatchSave') ? { columnWidth: 40 } : null"
@@ -166,7 +166,7 @@
             class="button-primary"
             @click="handleSave(record)"
             id="inventoryWarningList-add-btn">保存</a-button>
-          <a-button type="link" v-if="record.dealerProduct.sysFlag==1&&$hasPermissions('M_shoppingCart')" @click="addShopCar(record)">加入购物车</a-button>
+          <a-button type="link" v-if="record.dealerProduct.sysFlag==1&&record.dealerProduct.onlineFalg==1&&$hasPermissions('M_shoppingCart')" @click="addShopCar(record)">加入购物车</a-button>
           <span v-if="!$hasPermissions('B_inventoryWarningSave')">--</span>
         </template>
       </s-table>
@@ -401,7 +401,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 190
     }
   },
   watch: {