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> - +
(合计)板材数量:{{ 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> - +