소스 검색

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

lilei 1 년 전
부모
커밋
7e4a10480f
2개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 1
      src/views/purchasingManagement/purchaseOrderNew/outStockModal.vue
  2. 1 1
      src/views/shoppingCarManagement/shoppingCar/list.vue

+ 2 - 1
src/views/purchasingManagement/purchaseOrderNew/outStockModal.vue

@@ -67,7 +67,7 @@
             ref="table"
             size="small"
             :rowKey="(record) => record.id"
-            :row-selection="{ columnWidth: 40 ,getCheckboxProps:record=>({props:{disabled:(purchaseTargetType&&purchaseTargetType=='SUPPLIER_SYS')||record.productPowerFlag==0}})}"
+            :row-selection="{ columnWidth: 40 ,getCheckboxProps:record=>({props:{disabled:(purchaseTargetType&&purchaseTargetType=='SUPPLIER_SYS'&&record.onlineFalg == 0)||record.productPowerFlag==0}})}"
             :scroll="{ y:tableHeight, x: 1000 }"
             @rowSelection="rowSelectionFun"
             :data="loadData"
@@ -78,6 +78,7 @@
             <!-- 产品编码 -->
             <template slot="productCode" slot-scope="text, record">
               {{ record.productCode }}
+              <a-tag v-if="record.onlineFalg == 0">下架</a-tag>
               <a-tag color="red" v-if="record.productPowerFlag== 0">无权限</a-tag>
             </template>
           </s-table>

+ 1 - 1
src/views/shoppingCarManagement/shoppingCar/list.vue

@@ -97,7 +97,7 @@
         </div>
         <div v-else>
           <span style="padding-right: 15px;">{{ text }}</span>
-          <!-- <a-tag v-if="record.productEntity.onlineFalg == 0">下架</a-tag> -->
+          <a-tag v-if="record.productEntity.onlineFalg == 0">下架</a-tag>
           <a-tag color="red" v-if="record.dealerScopeFlag == 0">无权限</a-tag>
         </div>
       </template>