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

+ 1 - 1
public/version.json

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

+ 4 - 5
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -35,7 +35,7 @@
         </a-row>
         </a-row>
       </a-card>
       </a-card>
       <!-- 选择产品 -->
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="bulkWarehousingOrderEdit-cont">
+      <div class="bulkWarehousingOrderEdit-cont">
         <a-collapse :activeKey="['1']">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1">
           <a-collapse-panel key="1">
             <template slot="header">
             <template slot="header">
@@ -151,9 +151,9 @@
             </div>
             </div>
           </a-collapse-panel>
           </a-collapse-panel>
         </a-collapse>
         </a-collapse>
-      </a-card>
+      </div>
       <!-- 已选产品 -->
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="bulkWarehousingOrderEdit-cont">
+      <div class="bulkWarehousingOrderEdit-cont">
         <a-collapse :activeKey="['1']">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1">
           <a-collapse-panel key="1">
             <template slot="header">
             <template slot="header">
@@ -263,7 +263,7 @@
             </div>
             </div>
           </a-collapse-panel>
           </a-collapse-panel>
         </a-collapse>
         </a-collapse>
-      </a-card>
+      </div>
     </a-spin>
     </a-spin>
     <div class="affix-cont">
     <div class="affix-cont">
       <a-button
       <a-button
@@ -275,7 +275,6 @@
         @click="handleSubmit"
         @click="handleSubmit"
         style="padding: 0 60px;">提交</a-button>
         style="padding: 0 60px;">提交</a-button>
     </div>
     </div>
-    <!-- 导入弹框 -->
     <!-- 导入费用明细 -->
     <!-- 导入费用明细 -->
     <importGuideModal
     <importGuideModal
       :openModal="openGuideModal"
       :openModal="openGuideModal"

+ 6 - 6
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -42,7 +42,7 @@
         </a-row>
         </a-row>
       </a-card>
       </a-card>
       <!-- 选择产品 -->
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="purchaseOrderEdit-cont">
+      <div class="purchaseOrderEdit-cont">
         <a-collapse :activeKey="['1']">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1">
           <a-collapse-panel key="1">
             <template slot="header">
             <template slot="header">
@@ -157,9 +157,9 @@
             </div>
             </div>
           </a-collapse-panel>
           </a-collapse-panel>
         </a-collapse>
         </a-collapse>
-      </a-card>
+      </div>
       <!-- 已选产品 -->
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="purchaseOrderEdit-cont">
+      <div class="purchaseOrderEdit-cont">
         <a-collapse :activeKey="['1']">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1">
           <a-collapse-panel key="1">
             <template slot="header">已选产品</template>
             <template slot="header">已选产品</template>
@@ -198,8 +198,8 @@
                   </a-col>
                   </a-col>
                   <a-col :span="6">
                   <a-col :span="6">
                     <div style="float:right;overflow: hidden;">
                     <div style="float:right;overflow: hidden;">
-                      <a-button size="small" type="primary" class="button-primary" id="purchaseOrderEdit-import-btn" @click="handleOutStock">上次缺货</a-button>
-                      <a-button size="small" id="purchaseOrderEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
+                      <a-button type="primary" class="button-primary" id="purchaseOrderEdit-import-btn" @click="handleOutStock">上次缺货</a-button>
+                      <a-button id="purchaseOrderEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
                     </div>
                     </div>
                   </a-col>
                   </a-col>
                 </a-row>
                 </a-row>
@@ -242,7 +242,7 @@
             </div>
             </div>
           </a-collapse-panel>
           </a-collapse-panel>
         </a-collapse>
         </a-collapse>
-      </a-card>
+      </div>
     </a-spin>
     </a-spin>
     <div class="affix-cont">
     <div class="affix-cont">
       <a-button
       <a-button

+ 2 - 2
src/views/purchasingManagement/purchaseReturnApplyForm/edit.vue

@@ -92,7 +92,7 @@
         </a-collapse>
         </a-collapse>
       </div>
       </div>
       <!-- 已选产品 -->
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="purchaseReturnEdit-cont">
+      <div class="purchaseReturnEdit-cont">
         <a-collapse :activeKey="['1']">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1">
           <a-collapse-panel key="1">
             <template slot="header">
             <template slot="header">
@@ -185,7 +185,7 @@
             </s-table>
             </s-table>
           </a-collapse-panel>
           </a-collapse-panel>
         </a-collapse>
         </a-collapse>
-      </a-card>
+      </div>
     </a-spin>
     </a-spin>
     <a-card size="small" :bordered="false" class="affix-cont">
     <a-card size="small" :bordered="false" class="affix-cont">
       <a-button
       <a-button

+ 3 - 5
src/views/purchasingManagement/purchaseReturnOutSync/edit.vue

@@ -13,8 +13,7 @@
         </template>
         </template>
       </a-page-header>
       </a-page-header>
       <!-- 选择产品 -->
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="purchaseReturnEdit-cont">
-        <div class="purchaseReturnEdit-cont">
+      <div class="purchaseReturnEdit-cont">
           <a-collapse :activeKey="['1']">
           <a-collapse :activeKey="['1']">
             <a-collapse-panel key="1" header="选择产品">
             <a-collapse-panel key="1" header="选择产品">
               <!-- 筛选条件 -->
               <!-- 筛选条件 -->
@@ -103,9 +102,8 @@
             </a-collapse-panel>
             </a-collapse-panel>
           </a-collapse>
           </a-collapse>
         </div>
         </div>
-      </a-card>
       <!-- 已选产品 -->
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="purchaseReturnEdit-cont">
+      <div class="purchaseReturnEdit-cont">
         <a-collapse :activeKey="['1']">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1">
           <a-collapse-panel key="1">
             <template slot="header">
             <template slot="header">
@@ -200,7 +198,7 @@
             </s-table>
             </s-table>
           </a-collapse-panel>
           </a-collapse-panel>
         </a-collapse>
         </a-collapse>
-      </a-card>
+      </div>
     </a-spin>
     </a-spin>
     <a-card size="small" :bordered="false" class="affix-cont">
     <a-card size="small" :bordered="false" class="affix-cont">
       <a-button
       <a-button

+ 3 - 5
src/views/purchasingManagement/purchaseReturnOutSync/grapEdit.vue

@@ -13,8 +13,7 @@
         </template>
         </template>
       </a-page-header>
       </a-page-header>
       <!-- 选择产品 -->
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="purchaseReturnEdit-cont">
-        <div class="purchaseReturnEdit-cont">
+      <div class="purchaseReturnEdit-cont">
           <a-collapse :activeKey="['1']">
           <a-collapse :activeKey="['1']">
             <a-collapse-panel key="1" header="选择产品">
             <a-collapse-panel key="1" header="选择产品">
               <!-- 筛选条件 -->
               <!-- 筛选条件 -->
@@ -93,9 +92,8 @@
             </a-collapse-panel>
             </a-collapse-panel>
           </a-collapse>
           </a-collapse>
         </div>
         </div>
-      </a-card>
       <!-- 已选产品 -->
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="purchaseReturnEdit-cont">
+      <div class="purchaseReturnEdit-cont">
         <a-collapse :activeKey="['1']">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1">
           <a-collapse-panel key="1">
             <template slot="header">
             <template slot="header">
@@ -191,7 +189,7 @@
             </s-table>
             </s-table>
           </a-collapse-panel>
           </a-collapse-panel>
         </a-collapse>
         </a-collapse>
-      </a-card>
+      </div>
     </a-spin>
     </a-spin>
     <a-card size="small" :bordered="false" class="affix-cont">
     <a-card size="small" :bordered="false" class="affix-cont">
       <a-button
       <a-button