Kaynağa Gözat

Merge branch 'develop_yh27' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh28

# Conflicts:
#	src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue
lilei 1 yıl önce
ebeveyn
işleme
192ec76d8a

+ 4 - 4
src/views/productManagement/productPricing/editModal.vue

@@ -42,7 +42,7 @@
               id="productPricingEdit-afterCityPrice"
               v-model="form.afterCityPrice"
               :precision="2"
-              :min="0.01"
+              :min="form.afterProvincePrice||0.01"
               :max="999999"
               placeholder="请输入市级价"
               ref="afterCityPrice"
@@ -54,7 +54,7 @@
               id="productPricingEdit-afterSpecialPrice"
               v-model="form.afterSpecialPrice"
               :precision="2"
-              :min="0.01"
+              :min="form.afterCityPrice||0.01"
               :max="999999"
               placeholder="请输入特约价"
               ref="afterSpecialPrice"
@@ -66,7 +66,7 @@
               id="productPricingEdit-afterTerminalPrice"
               v-model="form.afterTerminalPrice"
               :precision="2"
-              :min="0.01"
+              :min="form.afterSpecialPrice||0.01"
               :max="999999"
               placeholder="请输入终端价"
               ref="afterTerminalPrice"
@@ -78,7 +78,7 @@
               id="productPricingEdit-afterCarOwnersPrice"
               v-model="form.afterCarOwnersPrice"
               :precision="2"
-              :min="0.01"
+              :min="form.afterTerminalPrice||0.01"
               :max="999999"
               placeholder="请输入车主价"
               ref="afterCarOwnersPrice"

+ 3 - 1
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -5,7 +5,9 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="salesReturnEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ ordeDetail&&ordeDetail.salesReturnBillNo }}</span>
+          <span style="margin: 0 10px;color: #666;font-weight: bold;">
+            单号:{{ ordeDetail&&ordeDetail.salesReturnBillNo }}
+          </span>
           <span style="margin: 0 10px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName || '--' }}</span>
           <span style="margin: 0 10px;color: #666;">
             退货仓库:{{ ordeDetail&&ordeDetail.warehouseName }}