Browse Source

bug修复 【ID1007515】成本价

chenrui 4 years ago
parent
commit
aa15205d89

+ 6 - 1
src/views/productManagement/productPricing/auditModal.vue

@@ -11,7 +11,12 @@
     <!-- 定价审核 -->
     <!-- 定价审核 -->
     <div v-if="detailsData">
     <div v-if="detailsData">
       <a-descriptions bordered :column="1">
       <a-descriptions bordered :column="1">
-        <a-descriptions-item label="成本价">50.00</a-descriptions-item>
+        <a-descriptions-item label="成本价">
+          <div v-if="detailsData && detailsData.supplierProductList">
+            <p v-for="(item, index) in detailsData.supplierProductList" :key="index" style="margin: 0;">{{ ((item.cost || item.cost==0) ? item.cost.toFixed(2) : '--') + ' 元 -- ' + item.supplierName + ';' }}</p>
+          </div>
+          <span v-else>--</span>
+        </a-descriptions-item>
         <a-descriptions-item label="省级价">
         <a-descriptions-item label="省级价">
           {{ detailsData.afterProvincePrice }}
           {{ detailsData.afterProvincePrice }}
           <span v-if="detailsData.afterProvincePrice != detailsData.beforeProvincePrice">(原{{ detailsData.beforeProvincePrice }})</span>
           <span v-if="detailsData.afterProvincePrice != detailsData.beforeProvincePrice">(原{{ detailsData.beforeProvincePrice }})</span>

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

@@ -20,7 +20,7 @@
       >
       >
         <a-form-model-item label="成本价">
         <a-form-model-item label="成本价">
           <div v-if="detailData && detailData.supplierProductList">
           <div v-if="detailData && detailData.supplierProductList">
-            <p v-for="(item, index) in detailData.supplierProductList" :key="index" style="margin: 0;">{{ ((item.cost || item.cost==0) ? item.cost.toFixed(2) : '--') + ' 元 -- ' + item.supplierName + ';' }}</p>
+            <p v-for="(item, index) in detailData.supplierProductList" :key="index" style="margin: 0;line-height: 1.5em;">{{ ((item.cost || item.cost==0) ? item.cost.toFixed(2) : '--') + ' 元 -- ' + item.supplierName + ';' }}</p>
           </div>
           </div>
           <span v-else>--</span>
           <span v-else>--</span>
         </a-form-model-item>
         </a-form-model-item>
@@ -116,7 +116,7 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       isShow: this.openModal, //  是否打开弹框
       formItemLayout: {
       formItemLayout: {
         labelCol: { span: 4 },
         labelCol: { span: 4 },
-        wrapperCol: { span: 16 }
+        wrapperCol: { span: 17 }
       },
       },
       form: {
       form: {
         afterProvincePrice: '',
         afterProvincePrice: '',