Merge branch 'main' of https://gitlab.com/seasoul1/middle-admin-ant

.gitlab-ci.yaml

@@ -0,0 +1,22 @@
+image: node:latest
+
+stages:
+  - build
+  - package
+
+build:
+  stage: build
+  script:
+    - npm install
+    - npm run build
+  artifacts:
+    paths:
+      - dist/
+
+package:
+  stage: package
+  script:
+    - tar -czvf dist.tar.gz dist/
+  artifacts:
+    paths:
+      - dist.tar.gz

src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue

@@ -37,7 +37,7 @@
               :title-align="formOptions.titleAlign" :rules="formOptions.rules" :items="formOptions.items" titleColon>
             </vxe-form>
           </a-collapse-panel>
-          <a-collapse-panel key="2" header="材料部分">
+          <a-collapse-panel key="2" header="部件部分">
 
             <div slot="extra">
               （合计）板材数量：{{ parseFloat(formOptions.data.fittings_total_quantity || 0).toFixed(0) }}

src/pages/Middle/bathroom/BathroomScheme/BathroomScheme/Edit.vue

@@ -19,7 +19,7 @@
           :title-align="formOptions.titleAlign" :rules="formOptions.rules" :items="formOptions.items" titleColon>
         </vxe-form>
       </a-collapse-panel>
-      <a-collapse-panel key="2" header="材料部分">
+      <a-collapse-panel key="2" header="部件部分">
 
         <vxe-table border show-overflow keep-source ref="fittings_xTable" :data="fittings_detailsData" :keyboard-config="{
           isArrow: true, isDel: true,