gjy пре 3 година
родитељ
комит
6a7e6e6d18
2 измењених фајлова са 8 додато и 9 уклоњено
  1. 7 8
      src/views/houseSelfCollect/acquisitionManagementAdd.vue
  2. 1 1
      vue.config.js

+ 7 - 8
src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -32,7 +32,7 @@
             </el-form-item>
           </div>
           <div class="grid-content">
-            <el-form-item label="干粮收购价格(元/公斤)" label-width="180px">
+            <el-form-item label="干粮收购价格(元/公斤)">
               <el-input v-model="baseInfoForm.dryGrainPrice" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
@@ -501,7 +501,7 @@
         if (isNaN(result)) {
           return false;
         }
-        result = Math.round(result * 100) / 100;
+        result = Math.round(result * 10000) / 10000;
         return result;
       },
       // 添加粮价设置
@@ -540,7 +540,7 @@
         this.priceList.push(_newObj)
       },
       // 删除价格组
-      delSetPrice(item, index) {
+      delSetPrice(item, index) {debugger
         let that = this
         this.checkList1 = []
         this.checkList2 = []
@@ -764,7 +764,7 @@
       // 提交
       submit() {
         this.makeTableList()
-        // this.makePriceDataList()
+        this.makePriceDataList()
         this.baseInfoForm.goodsName = this.selectVal
         let isValidate = false
         switch (this.$route.query.type) {
@@ -788,7 +788,6 @@
                 this.isCountShow = false
               })
             }
-            break;
             case "审核中":
              this.getEditCheckList()
             isValidate = this.validate()
@@ -871,7 +870,7 @@
         this.tableData = _list
       },
       // 获取分界价格数据,构造分界价格区间数据
-      getSplitPrice() {
+      getSplitPrice() {debugger
         let _priceList = this.priceList
         for (let i = 0; i < _priceList.length; i++) {
           for (let k = 0; k < _priceList[i].checkList.length; k++) {
@@ -901,7 +900,7 @@
         }
       },
       // 获取当前价格左右价格区间数据
-      getOtherPrice(list, nowList, direction) {debugger
+      getOtherPrice(list, nowList, direction) {
         //判断当前价格左右各有几个分界,返回当前除当前分界其他分界价格和
         let _left = []
         let _right = []
@@ -954,6 +953,7 @@
         let _price = 0
         for (let i = 0; i < this.splitPriceList.length; i++) {
           let _list = this.splitPriceList[i].priceList
+          console.log(_list)
           let basePrice = parseFloat(this.splitPriceList[i].basicUnitPrice)
           for (let k = 0; k < _list.length; k++) {
             //基准左边
@@ -969,7 +969,6 @@
                 let _otherPice = this.getOtherPrice(_list, _list[k], "leftBasic")
                 let _price1 = (_list[k].priceEnd - _waterMin) / 0.5 * _list[k].betweenPrice + _otherPice;
                 prcieList.push(basePrice + _price1)
-
               }
             }
             //基准值

+ 1 - 1
vue.config.js

@@ -141,7 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.103:9100/',
+        target: 'http://192.168.1.120:8090/',
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',