linwenxin hace 9 meses
padre
commit
3e965f0181

+ 2 - 2
src/views/auxiliaryFittings/auxiliaryDataManagement/masterAuxiliaryMaterials/index.vue

@@ -72,7 +72,7 @@ export default {
       formDialog: false,
       formData: {
         companyWechatName: JSON.parse(localStorage.getItem('greemall_user')).companyName,
-        categoryId: '',
+        goodsCategoryId: '',
         companyWechatId: '',
         goodsCode: '',
         goodsId: '',
@@ -159,7 +159,7 @@ export default {
           },
           formItemAttributes: {
             label: '选择分类',
-            prop: 'categoryId',
+            prop: 'goodsCategoryId',
             rules: [...required]
           }
         },

+ 21 - 5
src/views/auxiliaryFittings/salesManagement/components/attachmentSalesOrderDetail.vue

@@ -444,12 +444,13 @@
           <el-table-column prop="goods.productRelaName" align="center" label="适用产品大类"></el-table-column>
           <el-table-column prop="" align="center" label="销售价格">
             <template slot-scope="scope">
-              <el-input
+              {{ scope.row.price }}
+              <!-- <el-input
                 type="number"
                 v-model="scope.row.price"
                 :disabled="isEdit != scope.$index || formType == 2"
                 placeholder="请输入"
-              ></el-input>
+              ></el-input> -->
             </template>
           </el-table-column>
           <el-table-column prop="goods.saleAmount" align="center" label="销售金额">
@@ -624,6 +625,7 @@ import {
 } from '@/api/auxiliaryFittings/auxiliarySalesOrder'
 import { storageListPageV2 } from '@/api/storage.js'
 import selectEl from '@/utils/xialaxuanz.js'
+import { partsBaseConfig } from '@/api/partsSalesRatio.js'
 export default {
   components: { geographicalPosi, ImageUpload },
   props: ['id', 'title', 'formType'],
@@ -682,6 +684,11 @@ export default {
         remark: '',
         fileUrl: []
       },
+      beilvform: {
+        priceRate1: '',
+        priceRate2: '',
+        priceRate3: ''
+      },
       provinceList: [],
       cityList: [],
       areaList: [],
@@ -711,7 +718,6 @@ export default {
       }
     }
   },
-  computed: {},
   created() {
     if (this.id) {
       this.getDetail()
@@ -719,8 +725,14 @@ export default {
     this.getinitlbslist()
     this.getWebsit()
     this.getProject()
+    this.getpartsBaseConfig()
   },
   methods: {
+    getpartsBaseConfig() {
+      partsBaseConfig().then(res => {
+        this.beilvform = res.data
+      })
+    },
     // 返回
     goBack() {
       this.$emit('back')
@@ -867,13 +879,17 @@ export default {
       this.$forceUpdate()
     },
     changeGoods(e) {
-      console.log(e)
+      // 获取倍率
+      var beilv =
+        this.beilvform?.[
+          ['', 'priceRate1', 'priceRate2', 'priceRate3'][['空调', '生活电器', '冰箱'].indexOf(e.partType) + 1]
+        ]
       this.dataList[this.isEdit].goodsId = e.goodsId
       this.dataList[this.isEdit].goodsName = e.goodsName
       this.dataList[this.isEdit].goodsSalesUnit = e.goodsSalesUnit
       this.dataList[this.isEdit].brandRelaName = e.brandRelaName
       this.dataList[this.isEdit].productRelaName = e.productRelaName
-      this.dataList[this.isEdit].price = e.price
+      this.dataList[this.isEdit].price = e.price * (beilv ? beilv : 0)
       this.dataList[this.isEdit].goodsCode = e.goodsCode
       this.dataList[this.isEdit].qty = e.qty
       this.dataList[this.isEdit].itemSourceType = e.itemSourceType