Merge remote-tracking branch 'origin/develop' into develop

2021-12-02 17:56:56 +08:00
parent 3d12b97463 6fe296c813
commit c754a8dc78
2 changed files with 6 additions and 6 deletions
@@ -6649,13 +6649,13 @@ var PDFPageView = function () {
          watermark_txt: msg,
          watermark_x: 50,//水印起始位置x轴坐标
          watermark_y: 0,//水印起始位置Y轴坐标
-          watermark_rows: 7,//水印行数
-          watermark_cols: 5,//水印列数
-          watermark_x_space: 80,//水印x轴间隔
-          watermark_y_space: 120,//水印y轴间隔
+          watermark_rows: 15,//水印行数
+          watermark_cols: 7,//水印列数
+          watermark_x_space: 18,//水印x轴间隔
+          watermark_y_space: 20,//水印y轴间隔
          watermark_color: 'rgba(192, 192, 192)',//水印字体颜色
          watermark_alpha: 0.3,//水印透明度
-          watermark_fontsize: '30px',//水印字体大小
+          watermark_fontsize: '40px',//水印字体大小
          watermark_font: '微软雅黑',//水印字体
          watermark_width: 120,//水印宽度
          watermark_height: 80,//水印长度
@@ -29,7 +29,7 @@
                                        <el-radio label="1">海外标准入库</el-radio>
                                    </el-radio-group>
                                </el-form-item>
-                              <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled" v-show="form.standInData === '0'">
+                              <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
                                <el-select :popper-append-to-body="false" filterable v-model="form.standSort" placeholder="请选择标准类别">
                                  <el-option
                                      v-for="item in standSortOptions"