Merge remote-tracking branch 'origin/master'

吴羡

3 小时以前 f14e389b7f0feb6a2a55f4b9f58374a7bd9a4cc5

Merge remote-tracking branch 'origin/master'

 src/views/business/productOrder/components/printDialog.vue

@@ -33,8 +33,8 @@
                  </div>
                  <div class="item label-row">
                    <span class="label-col">
                      <span class="full-title">送样单位</span>:
                      <span class="value-wrap">{{ item.production }}</span>
                      <span class="full-title">样品外观</span>:
                      <span class="value-wrap">{{ item.sampleStatus || '-' }}</span>
                    </span>
                    <span class="label-col">
                      <span class="full-title">送样日期</span>:
@@ -102,8 +102,8 @@
              </div>
              <div class="item label-row">
                <span class="label-col">
                  <span class="full-title4">送样单位:</span>
                  <span class="value-wrap">{{ item.production }}</span>
                  <span class="full-title4">样品外观:</span>
                  <span class="value-wrap">{{ item.sampleStatus || '-' }}</span>
                </span>
                <span class="label-col">
                  <span class="full-title4">送样日期:</span>