Prechádzať zdrojové kódy

修改采购管理列表成本价 添加price价格 purchasePrice改为productPrice

chenrui 1 rok pred
rodič
commit
6070792663

+ 5 - 5
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -394,7 +394,7 @@ export default {
         arr.splice(1, 0, { title: '产品编码', dataIndex: 'code', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true })
       }
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(this.isDealerUp ? 7 : 6, 0, { title: '成本价', dataIndex: 'purchasePrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
+        arr.splice(this.isDealerUp ? 7 : 6, 0, { title: '成本价', dataIndex: 'productPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
       }
 
       return arr
@@ -504,11 +504,11 @@ export default {
       // 添加
       if (type == 0) {
         if (this.isDealerUp) {
-          if (row.purchasePrice) {
+          if (row.productPrice) {
             params.productSn = row.productSn
             params.purchaseBillSn = this.detail.purchaseBillSn
             params.purchaseBillNo = this.detail.purchaseBillNo
-            params.price = row.purchasePrice
+            params.price = row.productPrice
             params.qty = row.qty
             params.priceLevel = row.priceLevel
           } else {
@@ -516,11 +516,11 @@ export default {
             return
           }
         } else {
-          if (row.purchasePrice && row.terminalPrice && row.carOwnersPrice) {
+          if (row.productPrice && row.terminalPrice && row.carOwnersPrice) {
             params.productSn = row.productSn
             params.purchaseBillSn = this.detail.purchaseBillSn
             params.purchaseBillNo = this.detail.purchaseBillNo
-            params.price = row.purchasePrice
+            params.price = row.productPrice
             params.qty = row.qty
             params.priceLevel = row.priceLevel
           } else {

+ 5 - 5
src/views/purchasingManagement/purchaseOrderNew/chooseProductModal.vue

@@ -104,7 +104,7 @@
               class="button-primary"
               :loading="addLoading"
               @click="handleAdd(record)"
-              >添加</a-button>
+            >添加</a-button>
           </template>
         </s-table>
         <div v-else>
@@ -241,13 +241,13 @@ export default {
       ]
       // 产品来源
       if (this.isDealerUp) {
-        arr.splice(0,0,{ title: '产品编码', scopedSlots: { customRender: 'code' }, width: '150px', align: 'center', fixed: 'left' })
+        arr.splice(0, 0, { title: '产品编码', scopedSlots: { customRender: 'code' }, width: '150px', align: 'center', fixed: 'left' })
         arr.splice(2, 0, { title: '产品来源', dataIndex: 'sysFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } })
-      }else{
-        arr.splice(0,0,{ title: '产品编码', dataIndex: 'code', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left', sorter: true })
+      } else {
+        arr.splice(0, 0, { title: '产品编码', dataIndex: 'code', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, fixed: 'left', sorter: true })
       }
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(this.isDealerUp ? 4 : 3, 0, { title: '成本价', dataIndex: 'purchasePrice', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
+        arr.splice(this.isDealerUp ? 4 : 3, 0, { title: '成本价', dataIndex: 'productPrice', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
       }
       return arr
     }

+ 4 - 4
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -415,11 +415,11 @@ export default {
       // 添加
       if (type == 0) {
         if (this.isDealerUp) {
-          if (row.purchasePrice) {
+          if (row.productPrice) {
             params.productSn = row.productSn
             params.purchaseBillSn = this.detail.purchaseBillSn
             params.purchaseBillNo = this.detail.purchaseBillNo
-            params.price = row.purchasePrice
+            params.price = row.productPrice
             params.qty = row.qty
             params.priceLevel = row.priceLevel
           } else {
@@ -428,11 +428,11 @@ export default {
             return
           }
         } else {
-          if (row.purchasePrice && row.terminalPrice && row.carOwnersPrice) {
+          if (row.productPrice && row.terminalPrice && row.carOwnersPrice) {
             params.productSn = row.productSn
             params.purchaseBillSn = this.detail.purchaseBillSn
             params.purchaseBillNo = this.detail.purchaseBillNo
-            params.price = row.purchasePrice
+            params.price = row.productPrice
             params.qty = row.qty
             params.priceLevel = row.priceLevel
           } else {