chenrui 2 lat temu
rodzic
commit
b0fcf802e2

+ 20 - 13
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -7,10 +7,10 @@
         <template slot="subTitle">
           <a id="bulkWarehousingOrderEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <p style="display: inline-block;margin: 0 30px 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.sparePartsPurchaseNo) || '' }}</p>
-          <a @click="isShowBisiceInfo=!isShowBisiceInfo" style="color: #000;font-size: 14px;font-weight: 600;">
+          <a-button type="primary" ghost @click="isShowBisiceInfo=!isShowBisiceInfo">
             基础信息
             <a-icon :type="isShowBisiceInfo ? 'up' : 'down'"/>
-          </a>
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template
@@ -22,17 +22,21 @@
       </a-page-header>
       <!-- 基础信息 -->
       <a-card size="small" :bordered="false" v-if="isShowBisiceInfo" class="bulkWarehousingOrderEdit-cont">
-        <a-row :gutter="16">
-          <a-col class="gutter-row" :span="8">
-            供应商:{{ (basicInfoData&&basicInfoData.supplierName) || '--' }}
-          </a-col>
-          <a-col class="gutter-row" :span="8">
-            散件入库类型:{{ (basicInfoData&&basicInfoData.sparePartsTypeName) || '--' }}
-          </a-col>
-          <a-col class="gutter-row" :span="8">
-            备注:{{ (basicInfoData&&basicInfoData.remarks) || '--' }}
-          </a-col>
-        </a-row>
+        <a-collapse :activeKey="['1']">
+          <a-collapse-panel key="1" header="基础信息" :show-arrow="false" :disabled="true">
+            <a-row :gutter="16">
+              <a-col class="gutter-row" :span="8">
+                供应商:{{ (basicInfoData&&basicInfoData.supplierName) || '--' }}
+              </a-col>
+              <a-col class="gutter-row" :span="8">
+                散件入库类型:{{ (basicInfoData&&basicInfoData.sparePartsTypeName) || '--' }}
+              </a-col>
+              <a-col class="gutter-row" :span="8">
+                备注:{{ (basicInfoData&&basicInfoData.remarks) || '--' }}
+              </a-col>
+            </a-row>
+          </a-collapse-panel>
+        </a-collapse>
       </a-card>
       <!-- 选择产品 -->
       <a-card size="small" :bordered="false" class="bulkWarehousingOrderEdit-cont">
@@ -823,5 +827,8 @@ export default {
     .rightPrice.ant-input-number-sm input{
       text-align: right;
     }
+    .ant-collapse .ant-collapse-item-disabled > .ant-collapse-header{
+    color:#333;
+        }
   }
 </style>

+ 4 - 4
src/views/productManagement/productInfo/list.vue

@@ -31,13 +31,13 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="查看库存">
-                  <a-select @change="handleHasQty" :value="queryParam.stockEmptyFlag" placeholder="请选择查看库存类型">
+                <a-form-item label="是否有库存">
+                  <a-select @change="handleHasQty" :value="queryParam.stockEmptyFlag" placeholder="请选择查看是否有库存">
                     <a-select-option value="0">
-                      有库存
+                      
                     </a-select-option>
                     <a-select-option value="1">
-                      无库存
+                      
                     </a-select-option>
                   </a-select>
                 </a-form-item>

+ 38 - 28
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -6,10 +6,10 @@
         <template slot="subTitle">
           <a id="purchaseOrderEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <p class="billno">单号:{{ detail&&detail.purchaseBillNo }}</p>
-          <a @click="isShowBisiceInfo=!isShowBisiceInfo" style="margin-left:30px;color: #666;font-size: 14px;font-weight: 600;">
+          <a-button type="primary" ghost @click="isShowBisiceInfo=!isShowBisiceInfo" style="margin-left:30px;vertical-align:middle;">
             基础信息
             <a-icon :type="isShowBisiceInfo ? 'up' : 'down'"/>
-          </a>
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra" v-if="$hasPermissions('B_purchasePrint')">
@@ -18,28 +18,35 @@
       </a-page-header>
       <!-- 基础信息 -->
       <a-card size="small" :bordered="false" v-if="isShowBisiceInfo" class="purchaseOrderEdit-cont">
-        <a-row :gutter="16" type="flex" sjustify="center">
-          <a-col class="gutter-row" :span="12">
-            供应商:{{ detail&&detail.purchaseTargetName || '--' }}
-          </a-col>
-          <a-col class="gutter-row" :span="12">
-            支付方式:{{ detail&&detail.settleStyleSnDictValue || '--' }}
-          </a-col>
-          <a-col class="gutter-row" :span="12">
-            收货人:{{ detail&&detail.consigneeName || '--' }}({{ detail&&detail.consigneeTel || '--' }})
-          </a-col>
-          <a-col class="gutter-row" :span="12">
-            <span>收货地址:</span>
-            <div style="display: inline-block;width:90%;vertical-align: top;" v-if="detail&&(detail.shippingAddressProvinceName || detail.shippingAddressCityName || detail.shippingAddressCountyName || detail.shippingAddress)">
-              {{ detail&&detail.shippingAddressProvinceName || '' }}
-              {{ detail&&detail.shippingAddressCityName || '' }}
-              {{ detail&&detail.shippingAddressCountyName || '' }}
-              {{ detail&&detail.shippingAddress || '' }}
-              <a-button type="link" @click="openAddrModal=true">更换地址 >></a-button>
-            </div>
-            <div v-else><a-button type="link" @click="openAddrModal=true">选择地址 >></a-button></div>
-          </a-col>
-        </a-row>
+        <a-collapse :activeKey="['1']">
+          <a-collapse-panel key="1" :show-arrow="false" :disabled="true">
+            <template slot="header">
+              基础信息
+            </template>
+            <a-row :gutter="16" type="flex" sjustify="center">
+              <a-col class="gutter-row" :span="12">
+                供应商:{{ detail&&detail.purchaseTargetName || '--' }}
+              </a-col>
+              <a-col class="gutter-row" :span="12">
+                支付方式:{{ detail&&detail.settleStyleSnDictValue || '--' }}
+              </a-col>
+              <a-col class="gutter-row" :span="12">
+                收货人:{{ detail&&detail.consigneeName || '--' }}({{ detail&&detail.consigneeTel || '--' }})
+              </a-col>
+              <a-col class="gutter-row" :span="12">
+                <span>收货地址:</span>
+                <div style="display: inline-block;width:90%;vertical-align: top;" v-if="detail&&(detail.shippingAddressProvinceName || detail.shippingAddressCityName || detail.shippingAddressCountyName || detail.shippingAddress)">
+                  {{ detail&&detail.shippingAddressProvinceName || '' }}
+                  {{ detail&&detail.shippingAddressCityName || '' }}
+                  {{ detail&&detail.shippingAddressCountyName || '' }}
+                  {{ detail&&detail.shippingAddress || '' }}
+                  <a-button type="link" @click="openAddrModal=true">更换地址 >></a-button>
+                </div>
+                <div v-else><a-button type="link" @click="openAddrModal=true">选择地址 >></a-button></div>
+              </a-col>
+            </a-row>
+          </a-collapse-panel>
+        </a-collapse>
       </a-card>
       <!-- 选择产品 -->
       <a-card size="small" :bordered="false" class="purchaseOrderEdit-cont">
@@ -653,7 +660,7 @@ export default {
       font-size: 18px;
       font-weight: 600;
       display: inline-block;
-      vertical-align: top;
+      vertical-align: middle;
       color: #666;
     }
     .purchaseOrderEdit-cont{
@@ -678,8 +685,11 @@ export default {
         margin-left: 15px;
       }
     }
-    .gutter-row:nth-child(1),.gutter-row:nth-child(2){
-      margin-bottom:10px;
-    }
+     .gutter-row:nth-child(1),.gutter-row:nth-child(2){
+          margin-bottom:10px;
+        }
+    .ant-collapse .ant-collapse-item-disabled > .ant-collapse-header{
+    color:#333;
+        }
   }
 </style>