From 8e1b5f1972d08baf37996ed5879b066d4b5afac3 Mon Sep 17 00:00:00 2001
From: zxx <47968546@163.com>
Date: Mon, 31 Jul 2023 17:25:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E7=B3=BB=E7=BB=9F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BA=86=E6=9D=90=E6=96=99=E9=83=A8=E5=88=86=E7=9A=84?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=8C=E6=94=B9=E4=B8=BA=E9=83=A8=E4=BB=B6?=
 =?UTF-8?q?=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yaml                               | 22 +++++++++++++++++++
 .../BathroomQuotation/Edit.vue                |  2 +-
 .../BathroomScheme/BathroomScheme/Edit.vue    |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 .gitlab-ci.yaml

diff --git a/.gitlab-ci.yaml b/.gitlab-ci.yaml
new file mode 100644
index 0000000..46b7444
--- /dev/null
+++ b/.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
\ No newline at end of file
diff --git a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue b/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue
index bd7fccf..5bfcf13 100644
--- a/src/pages/Middle/bathroom/BathroomQuotation/BathroomQuotation/Edit.vue
+++ b/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) }}
diff --git a/src/pages/Middle/bathroom/BathroomScheme/BathroomScheme/Edit.vue b/src/pages/Middle/bathroom/BathroomScheme/BathroomScheme/Edit.vue
index 4a8f577..0bc6917 100644
--- a/src/pages/Middle/bathroom/BathroomScheme/BathroomScheme/Edit.vue
+++ b/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,