Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/layout/index/top/index.vue

@@ -421,6 +421,7 @@
         }
         //  this.barCode = ''
         //判断当前账号公司是否是二维码上公司
+        debugger
         if (this.userINfo.userCompany != _userCompId) {
           console.log('请切换公司在试！')
           this.$message.error('当前身份不可操作');
@@ -565,15 +566,15 @@
           })
           .toPromise()
           .then((response) => {
-              if ( response.personCharge == userName || (response.otherPersonCharge && response.otherPersonCharge.indexOf(userName) != -1)) {
+              // if ( response.personCharge == userName || (response.otherPersonCharge && response.otherPersonCharge.indexOf(userName) != -1)) {
                   //扫码枪扫码后显示弹框
                    this.getQRCodeData(this.tmp)
-              }else{
-                console.log('你没有该权限，不可操作')
-                 this.$message.error('当前身份不可操作');
-                 this.barCode = ''
-                 return
-              }
+              // }else{
+              //   console.log('你没有该权限，不可操作')
+              //    this.$message.error('当前身份不可操作');
+              //    this.barCode = ''
+              //    return
+              // }
             
           })
       },

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -4,12 +4,16 @@
     <!-- <div class="type">{{type}}</div> -->
     <el-header class="header">
       <img class="head-icon" src="../../../public/img/icons/acquisition6.png" alt="">
-      <div class="head-title">{{baseInfoForm.warehouseName}}</div>
+      <div class="head-title">{{ baseInfoForm.warehouseName }}</div>
     </el-header>
     <el-main v-show="isCountShow">
       <el-form ref="baseInfoForm" label-position="left" :model="baseInfoForm" label-width="120px">
         <el-row class="base-info">
-          基本信息
+          <el-col :span="2" style="line-height: 32px;">基本信息</el-col>
+          <el-col :span="22">
+            <el-button :type="isSolidFood?'primary':''" @click="typeChange()">以水分定价</el-button>
+            <el-button :type="isSolidFood?'primary':''" @click="typeChange(1)">以容重定价</el-button>
+          </el-col>
         </el-row>
         <div class="row1">
           <div class="grid-content">
@@ -28,7 +32,7 @@
                 @input="changeBaseWater" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
-          
+
           <!-- <div v-if="baseInfoForm.paramType != '1'" class="grid-content"> -->
           <div class="grid-content" v-if="!isSolidFood">
             <el-form-item label="扣重比">
@@ -56,7 +60,7 @@
                 :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
-          <div class="grid-content" >
+          <div class="grid-content">
             <el-form-item label="销售上限(吨/年)">
               <el-input type="number" @mousewheel.native.prevent v-model="baseInfoForm.saleLimit" :disabled="!isEdit">
               </el-input>
@@ -76,21 +80,21 @@
       <el-row class="row3">
         <div class="top">
           <div class="title">粮价设置</div>
-          <el-button v-if="checkList.length<4&&!isSolidFood" class="btn" @click="newSetPrice" :disabled="!isEdit">新增
+          <el-button v-if="checkList.length < 4 && !isSolidFood" class="btn" @click="newSetPrice" :disabled="!isEdit">新增
           </el-button>
         </div>
         <div v-if="!isSolidFood">
-          <div class="content" v-for="(item,index) in priceList" :key="index">
+          <div class="content" v-for="(item, index) in priceList" :key="index">
             <div class="top">
               <div class="left">
-                <div v-if="baseInfoForm.paramType == '2' " class="text">基准单价（元/公斤）</div>
-                <el-input v-if="baseInfoForm.paramType == '2' " type="number" @mousewheel.native.prevent
+                <div v-if="baseInfoForm.paramType == '2'" class="text">基准单价（元/公斤）</div>
+                <el-input v-if="baseInfoForm.paramType == '2'" type="number" @mousewheel.native.prevent
                   v-model="item.basicUnitPrice" :disabled="!isEdit"></el-input>
               </div>
-              <el-button @click="delSetPrice(item,index)" :disabled="!isEdit">删除</el-button>
+              <el-button @click="delSetPrice(item, index)" :disabled="!isEdit">删除</el-button>
             </div>
             <div class="level">
-              <el-checkbox-group v-model="item.checkList" @change="changeLevel($event,index)">
+              <el-checkbox-group v-model="item.checkList" @change="changeLevel($event, index)">
                 <el-checkbox label="一等" :disabled="!isEdit"></el-checkbox>
                 <el-checkbox label="二等" :disabled="!isEdit"></el-checkbox>
                 <el-checkbox label="三等" :disabled="!isEdit"></el-checkbox>
@@ -106,29 +110,29 @@
               <div class="right">
                 <div class="line"></div>
                 <div class="jt-style"></div>
-                <div v-for="(item1,index) in item.detailList">
+                <div v-for="(item1, index) in item.detailList">
                   <div class="item-style">
-                    <div v-if="item1.type!=4" class="item-style-title">
-                      <span>{{item1.name}}{{item1.index}}</span>
-                      <el-button class="add" @click="add(item,item1,index)" v-if="item1.type!=3" :disabled="!isEdit">+
+                    <div v-if="item1.type != 4" class="item-style-title">
+                      <span>{{ item1.name }}{{ item1.index }}</span>
+                      <el-button class="add" @click="add(item, item1, index)" v-if="item1.type != 3" :disabled="!isEdit">+
                       </el-button>
-                      <el-button class="reduce" @click="reduce(item,item1,index)"
-                        v-show="item1.type!=1&&item1.type!=2&&item1.type!=3" :disabled="!isEdit">-</el-button>
+                      <el-button class="reduce" @click="reduce(item, item1, index)"
+                        v-show="item1.type != 1 && item1.type != 2 && item1.type != 3" :disabled="!isEdit">-</el-button>
                     </div>
-                    <div v-show="item1.type!=4">
-                      <input v-if='item1.type==1' class="water-price" :class="item1.isWrite?'white-bgc':''"
-                        v-model="baseInfoForm.waterMin" :disabled="item1.isWrite?false:true"></input>
-                      <input v-if='item1.type==2' class="water-price" :class="item1.isWrite?'white-bgc':''"
-                        v-model="baseInfoForm.waterBase" :disabled="item1.isWrite?false:true"></input>
-                      <input v-if='item1.type==3' class="water-price" :class="item1.isWrite?'white-bgc':''"
-                        v-model="baseInfoForm.waterMax" :disabled="item1.isWrite?false:true"></input>
-                      <input v-if='item1.type==5' class="water-price" :class="item1.isWrite?'white-bgc':''"
-                        v-model="item1.water" :disabled="isEdit?false:true"></input>
+                    <div v-show="item1.type != 4">
+                      <input v-if='item1.type == 1' class="water-price" :class="item1.isWrite ? 'white-bgc' : ''"
+                        v-model="baseInfoForm.waterMin" :disabled="item1.isWrite ? false : true"></input>
+                      <input v-if='item1.type == 2' class="water-price" :class="item1.isWrite ? 'white-bgc' : ''"
+                        v-model="baseInfoForm.waterBase" :disabled="item1.isWrite ? false : true"></input>
+                      <input v-if='item1.type == 3' class="water-price" :class="item1.isWrite ? 'white-bgc' : ''"
+                        v-model="baseInfoForm.waterMax" :disabled="item1.isWrite ? false : true"></input>
+                      <input v-if='item1.type == 5' class="water-price" :class="item1.isWrite ? 'white-bgc' : ''"
+                        v-model="item1.water" :disabled="isEdit ? false : true"></input>
                     </div>
-                    <div class="circle" v-if="item1.type!=4"></div>
+                    <div class="circle" v-if="item1.type != 4"></div>
                   </div>
                   <div class="bottom-price">
-                    <input v-if="item1.type==4" class="water-price" :class="isEdit?'white-bgc':''"
+                    <input v-if="item1.type == 4" class="water-price" :class="isEdit ? 'white-bgc' : ''"
                       v-model="item1.jfprice" :disabled="!isEdit"></input>
                   </div>
                 </div>
@@ -144,27 +148,27 @@
                 <div>容重（g/L）</div>
                 <div>价格（元/公斤）</div>
               </div>
-             
+
               <div class="right">
                 <div class="jt-style1"></div>
                 <div class="line1"></div>
-                
-                <div v-for="(item1,index) in priceRZObj.detailList" :key="index">
+
+                <div v-for="(item1, index) in priceRZObj.detailList" :key="index">
                   <div class="item-style" v-if="item1.isShow">
-                    <div v-if="item1.type!=4" class="item-style-title">
-                      <span>{{item1.name}}</span>
-                      <el-button class="add" @click="addRZ(item1,index)" v-if="item1.type!=3" :disabled="!isEdit">+
+                    <div v-if="item1.type != 4" class="item-style-title">
+                      <span>{{ item1.name }}</span>
+                      <el-button class="add" @click="addRZ(item1, index)" v-if="item1.type != 3" :disabled="!isEdit">+
                       </el-button>
-                      <el-button class="reduce" @click="reduceRZ(item1,index)"
-                        v-show="item1.type!=1&&priceRZObj.detailList.length>2" :disabled="!isEdit">-</el-button>
+                      <el-button class="reduce" @click="reduceRZ(item1, index)"
+                        v-show="item1.type != 1 && priceRZObj.detailList.length > 2" :disabled="!isEdit">-</el-button>
                     </div>
-                    <div v-show="item1.type!=4">
-                      <input class="water-price" :class="item1.isWrite?'white-bgc':''" v-model="item1.weight" ></input>
+                    <div v-show="item1.type != 4">
+                      <input class="water-price" :class="item1.isWrite ? 'white-bgc' : ''" v-model="item1.weight"></input>
                     </div>
-                    <div class="circle" v-if="item1.type!=4"></div>
+                    <div class="circle" v-if="item1.type != 4"></div>
                   </div>
                   <div class="bottom-price">
-                    <input v-if="item1.type==4" class="water-price" :class="isEdit?'white-bgc':''"
+                    <input v-if="item1.type == 4" class="water-price" :class="isEdit ? 'white-bgc' : ''"
                       v-model="item1.jfprice" :disabled="!isEdit"></input>
                   </div>
                 </div>
@@ -172,13 +176,13 @@
             </div>
           </div>
         </div>
-        <el-button class="submit" @click="submit">{{submitName}}</el-button>
+        <el-button class="submit" @click="submit">{{ submitName }}</el-button>
       </el-row>
     </el-main>
     <el-main v-show="!isCountShow">
       <div class="page2-content" v-if="!this.baseInfoForm.bulkDensityStandard">
         <div class="titel">
-          {{selectVal}}价格对照表（按水分）
+          {{ selectVal }}价格对照表（按水分）
         </div>
         <el-table :data="tableData" style="width: 100%" :row-class-name="tableRowClassName">
           <el-table-column prop="waterMin" label="水分下限(%)">
@@ -195,12 +199,13 @@
           </el-table-column>
         </el-table>
       </div>
-      <div class="page2-content" v-else><!-- 容重打印 -->
+      <div class="page2-content" v-else>
+        <!-- 容重打印 -->
         <div class="titel">
-          {{selectVal}}价格对照表（按容重）
+          {{ selectVal }}价格对照表（按容重）
         </div>
         <el-table :data="tableData1" style="width: 100%" :row-class-name="tableRowClassName">
-           <el-table-column prop="bulkDensityMax" label="容重上限">
+          <el-table-column prop="bulkDensityMax" label="容重上限">
           </el-table-column>
           <el-table-column prop="bulkDensityMin" label="容重下限">
           </el-table-column>
@@ -209,7 +214,7 @@
         </el-table>
       </div>
       <div class="bottom-btn">
-        <div v-if="baseInfoForm.status=='审核中'" class="left">当前价格尚未通过审核，建议审核通过后进行打印</div>
+        <div v-if="baseInfoForm.status == '审核中'" class="left">当前价格尚未通过审核，建议审核通过后进行打印</div>
         <div class="right">
           <el-button class="submit" @click="closeCount">关闭</el-button>
           <el-button class="submit" @click="print">打印</el-button>
@@ -231,10 +236,10 @@ export default {
   watch: {},
   data() {
     return {
-      leftFJPrice:{},
-      leftFJIndex:0,
-      rightFJPrice:{},
-      rightFJIndex:0,
+      leftFJPrice: {},
+      leftFJIndex: 0,
+      rightFJPrice: {},
+      rightFJIndex: 0,
       isSolidFood: false,
       isShowTip: false,
       price: 0,
@@ -367,44 +372,45 @@ export default {
         if (_goodsNameList.length == 0) {
           this.goodnameList = response
           this.selectVal = response[0].constValue
-          // if (this.selectVal == '玉米淀粉' ||
-          //   this.selectVal == '玉米（机收）' ||
-          //   this.selectVal == '玉米（酒精）' ||
-          //   this.selectVal == '玉米（筛漏）' ||
-          //   this.selectVal == '玉米（陈粮）' ||
-          //   this.selectVal == '玉米（棒）' ||
-          //   this.selectVal == '玉米'
-          // ) {
-          //   this.isSolidFood = true
-          //   this.baseInfoForm.bulkDensityStandard = 1
-          // } else {
-          //   this.isSolidFood = false
-          //   this.baseInfoForm.bulkDensityStandard = ''
-          // }
-          this.isSolidFood = false
-          this.baseInfoForm.bulkDensityStandard = ''
+          if (this.selectVal == '玉米淀粉' ||
+            this.selectVal == '玉米（机收）' ||
+            this.selectVal == '玉米（酒精）' ||
+            this.selectVal == '玉米（筛漏）' ||
+            this.selectVal == '玉米（陈粮）' ||
+            this.selectVal == '玉米（棒）' ||
+            this.selectVal == '玉米'
+          ) {
+            this.isSolidFood = true
+            this.baseInfoForm.bulkDensityStandard = 1
+          } else {
+            this.isSolidFood = false
+            this.baseInfoForm.bulkDensityStandard = ''
+          }
+
+          // this.isSolidFood = false
+          // this.baseInfoForm.bulkDensityStandard = ''
           this.baseInfoForm.goodsNameKey = response[0].constKey
-        } else{
+        } else {
           this.goodnameList = _list
           if (_list.length != 0) {
             this.selectVal = _list[0].constValue
-            // this.selectVal = _goodsNameList[0]
-          //   if (this.selectVal == '玉米淀粉' ||
-          //   this.selectVal == '玉米（机收）' ||
-          //   this.selectVal == '玉米（酒精）' ||
-          //   this.selectVal == '玉米（筛漏）' ||
-          //   this.selectVal == '玉米（陈粮）' ||
-          //   this.selectVal == '玉米（棒）' ||
-          //   this.selectVal == '玉米'
-          // ) {
-          //   this.isSolidFood = true
-          //   this.baseInfoForm.bulkDensityStandard = 1
-          // } else {
-          //   this.isSolidFood = false
-          //   this.baseInfoForm.bulkDensityStandard = ''
-          // }
+            this.selectVal = _goodsNameList[0]
+            if (this.selectVal == '玉米淀粉' ||
+              this.selectVal == '玉米（机收）' ||
+              this.selectVal == '玉米（酒精）' ||
+              this.selectVal == '玉米（筛漏）' ||
+              this.selectVal == '玉米（陈粮）' ||
+              this.selectVal == '玉米（棒）' ||
+              this.selectVal == '玉米'
+            ) {
+              this.isSolidFood = true
+              this.baseInfoForm.bulkDensityStandard = 1
+            } else {
+              this.isSolidFood = false
+              this.baseInfoForm.bulkDensityStandard = ''
+            }
             this.baseInfoForm.goodsNameKey = _list[0].constKey
-            
+
             this.isSolidFood = false
             this.baseInfoForm.bulkDensityStandard = ''
           }
@@ -509,6 +515,15 @@ export default {
     }
   },
   methods: {
+    typeChange(val){
+      if(val == 1){
+        this.isSolidFood = true
+        this.baseInfoForm.bulkDensityStandard = 1
+      }else{
+        this.isSolidFood = false
+        this.baseInfoForm.bulkDensityStandard = ""
+      }
+    },
     onCloseGoodSelect() {
       this.$refs.elSelect.blur()
     },
@@ -543,8 +558,8 @@ export default {
           //   this.isSolidFood = false
           //   this.baseInfoForm.bulkDensityStandard = ''
           // }
-            this.isSolidFood = false
-            this.baseInfoForm.bulkDensityStandard = ''
+          // this.isSolidFood = false
+          // this.baseInfoForm.bulkDensityStandard = ''
           if (this.$route.query.type != '新增') {
             let _data = this.priceList
             this.checkList1 = []
@@ -569,7 +584,7 @@ export default {
         })
     },
     goodsChange(e) {
-      if ( e == '玉米淀粉' ||
+      if (e == '玉米淀粉' ||
         e == '玉米（机收）' ||
         e == '玉米（酒精）' ||
         e == '玉米（筛漏）' ||
@@ -604,10 +619,6 @@ export default {
         this.baseInfoForm.warehouseName = this.$route.query.warehouseName
         this.baseInfoForm.compId = this.$route.query.compId
         this.baseInfoForm.bulkDensityStandard = 1
-      } else {
-        this.isSolidFood = false
-        // this.isSolidFood = false
-        this.baseInfoForm.bulkDensityStandard = ''
       }
       for (let num = 0; num < this.goodnameList.length; num++) {
         if (e == this.goodnameList[num].constValue) {
@@ -753,10 +764,10 @@ export default {
         s2 = arg2.toString()
       try {
         m += s1.split('.')[1].length
-      } catch (e) {}
+      } catch (e) { }
       try {
         m += s2.split('.')[1].length
-      } catch (e) {}
+      } catch (e) { }
       return (
         (Number(s1.replace('.', '')) * Number(s2.replace('.', ''))) /
         Math.pow(10, m)
@@ -935,9 +946,9 @@ export default {
       if (this.baseInfoForm.bulkDensityStandard == 1) {
         window.open(
           '../../../static/print.html?name=' +
-            this.baseInfoForm.goodsName +
-            '&type=' +
-            1
+          this.baseInfoForm.goodsName +
+          '&type=' +
+          1
         )
       } else {
         window.open(
@@ -1289,50 +1300,48 @@ export default {
             isValidate = this.validate()
             if (isValidate) {
               if (this.baseInfoForm.bulkDensityStandard == 1) {
-              //以容重另外校验
-               let inspect = this.check() //
-               if(inspect){
+                //以容重另外校验
+                let inspect = this.check() //
+                if (inspect) {
+                  purchasePriceAdd(this.baseInfoForm)
+                    .toPromise()
+                    .then((response) => {
+                      // this.tableData = response.records
+                      this.isCountShow = false
+                    })
+                }
+              } else {
                 purchasePriceAdd(this.baseInfoForm)
-                .toPromise()
-                .then((response) => {
-                  // this.tableData = response.records
-                  this.isCountShow = false
-                })
-               }
-               
-            }else{
-              purchasePriceAdd(this.baseInfoForm)
-                .toPromise()
-                .then((response) => {
-                  // this.tableData = response.records
-                  this.isCountShow = false
-                })
-            }
-            
+                  .toPromise()
+                  .then((response) => {
+                    // this.tableData = response.records
+                    this.isCountShow = false
+                  })
+              }
             }
             break
           case '编辑':
-          isValidate = this.validate()
-             if (!this.baseInfoForm.bulkDensityStandard) {
+            isValidate = this.validate()
+            if (!this.baseInfoForm.bulkDensityStandard) {
               //以水分计算等级
               this.getEditCheckList()
               if (isValidate) {
-              purchasePriceEdit(this.baseInfoForm)
-                .toPromise()
-                .then((response) => {
-                  this.isCountShow = false
-                })
-            }
-            }else{
-               let inspect = this.check() //以容重另外校验
-               if(inspect && isValidate){
                 purchasePriceEdit(this.baseInfoForm)
-                .toPromise()
-                .then((response) => {
-                  // this.tableData = response.records
-                  this.isCountShow = false
-                })
-               }
+                  .toPromise()
+                  .then((response) => {
+                    this.isCountShow = false
+                  })
+              }
+            } else {
+              let inspect = this.check() //以容重另外校验
+              if (inspect && isValidate) {
+                purchasePriceEdit(this.baseInfoForm)
+                  .toPromise()
+                  .then((response) => {
+                    // this.tableData = response.records
+                    this.isCountShow = false
+                  })
+              }
             }
             break
           case '审核中':
@@ -1361,18 +1370,18 @@ export default {
         }
       }
     },
-    check(){
+    check() {
       let that = this
-      for(let i = 0;i < this.baseInfoForm.detailPrints.length;i++){
-        if(!this.baseInfoForm.detailPrints[i].bulkDensityMin || !this.baseInfoForm.detailPrints[i].bulkDensityMax||!this.baseInfoForm.detailPrints[i].bulkDensityPrice){
-        that.$message.error('请输入容重和对应区间价格！')
-        return false
+      for (let i = 0; i < this.baseInfoForm.detailPrints.length; i++) {
+        if (!this.baseInfoForm.detailPrints[i].bulkDensityMin || !this.baseInfoForm.detailPrints[i].bulkDensityMax || !this.baseInfoForm.detailPrints[i].bulkDensityPrice) {
+          that.$message.error('请输入容重和对应区间价格！')
+          return false
+        }
+
+        if (Number(this.baseInfoForm.detailPrints[i].bulkDensityMin) > Number(this.baseInfoForm.detailPrints[i].bulkDensityMax)) {
+          that.$message.error('请从左到右按大到小填写容重！')
+          return false
         }
-       
-      if(Number(this.baseInfoForm.detailPrints[i].bulkDensityMin) > Number(this.baseInfoForm.detailPrints[i].bulkDensityMax)){
-        that.$message.error('请从左到右按大到小填写容重！')
-        return false
-      }
       }
       return true
     },
@@ -1579,12 +1588,12 @@ export default {
       let that = this
       this.left = []
       this.right = []
-      
+
       let _priceList = this.priceList
       for (let i = 0; i < _priceList.length; i++) {
         for (let k = 0; k < _priceList[i].checkList.length; k++) {
-          this.rightFJIndex=0
-          this.leftFJIndex=0
+          this.rightFJIndex = 0
+          this.leftFJIndex = 0
           let _leftObj = {}
           _leftObj.level = _priceList[i].checkList[k]
           _leftObj.basicUnitPrice = parseFloat(_priceList[i].basicUnitPrice)
@@ -1622,23 +1631,23 @@ export default {
                   } else {
                     baseprice = parseFloat(
                       parseFloat(_priceList[i].basicUnitPrice) +
-                        ((parseFloat(_priceList[i].detailList[j + 2].water) -
-                          parseFloat(_priceList[i].detailList[j].water)) /
-                          0.1) *
-                          ((this.baseInfoForm.dryGrainPrice *
-                            (parseFloat(_priceList[i].detailList[j].water) -
-                              parseFloat(
-                                _priceList[i].detailList[j - 2].water
-                              )) *
-                            parseFloat(
-                              _priceList[i].detailList[j - 1].jfprice
-                            )) /
-                            100 /
-                            ((parseFloat(_priceList[i].detailList[j].water) -
-                              parseFloat(
-                                _priceList[i].detailList[j - 2].water
-                              )) /
-                              0.1))
+                      ((parseFloat(_priceList[i].detailList[j + 2].water) -
+                        parseFloat(_priceList[i].detailList[j].water)) /
+                        0.1) *
+                      ((this.baseInfoForm.dryGrainPrice *
+                        (parseFloat(_priceList[i].detailList[j].water) -
+                          parseFloat(
+                            _priceList[i].detailList[j - 2].water
+                          )) *
+                        parseFloat(
+                          _priceList[i].detailList[j - 1].jfprice
+                        )) /
+                        100 /
+                        ((parseFloat(_priceList[i].detailList[j].water) -
+                          parseFloat(
+                            _priceList[i].detailList[j - 2].water
+                          )) /
+                          0.1))
                     )
                   }
                   _leftObj.priceList.push({
@@ -1652,10 +1661,10 @@ export default {
                         (parseFloat(_priceList[i].detailList[j].water) -
                           parseFloat(_priceList[i].detailList[j - 2].water)) *
                         parseFloat(_priceList[i].detailList[j - 1].jfprice)) /
-                        100 /
-                        ((parseFloat(_priceList[i].detailList[j].water) -
-                          parseFloat(_priceList[i].detailList[j - 2].water)) /
-                          0.1)
+                      100 /
+                      ((parseFloat(_priceList[i].detailList[j].water) -
+                        parseFloat(_priceList[i].detailList[j - 2].water)) /
+                        0.1)
                     ),
                     baseprice: baseprice,
                     price:
@@ -1668,38 +1677,38 @@ export default {
                   if (j == index) {
                     baseprice = parseFloat(_priceList[i].basicUnitPrice)
                   } else {
-                      if(_priceList[i].detailList[j].type==5){
-                        this.leftFJIndex++
-                        if(this.leftFJIndex==1){
-                          baseprice = parseFloat(
-                      parseFloat(_priceList[i].basicUnitPrice) +
-                        ((parseFloat(_priceList[i].detailList[j + 2].water) -
-                          parseFloat(_priceList[i].detailList[j].water)) /
-                          0.1) *
-                          parseFloat(_priceList[i].detailList[j + 1].jfprice)
-                    )
-                    this.leftFJPrice = baseprice
-                        }else if(this.leftFJIndex>1){
-                          baseprice = parseFloat(
-                      parseFloat(this.leftFJPrice) +
-                        ((parseFloat(_priceList[i].detailList[j + 2].water) -
-                          parseFloat(_priceList[i].detailList[j].water)) /
-                          0.1) *
+                    if (_priceList[i].detailList[j].type == 5) {
+                      this.leftFJIndex++
+                      if (this.leftFJIndex == 1) {
+                        baseprice = parseFloat(
+                          parseFloat(_priceList[i].basicUnitPrice) +
+                          ((parseFloat(_priceList[i].detailList[j + 2].water) -
+                            parseFloat(_priceList[i].detailList[j].water)) /
+                            0.1) *
                           parseFloat(_priceList[i].detailList[j + 1].jfprice)
-                    )
-                    this.leftFJPrice = baseprice
-                        }
-                      }else{
+                        )
+                        this.leftFJPrice = baseprice
+                      } else if (this.leftFJIndex > 1) {
                         baseprice = parseFloat(
-                      parseFloat(_priceList[i].basicUnitPrice) +
+                          parseFloat(this.leftFJPrice) +
+                          ((parseFloat(_priceList[i].detailList[j + 2].water) -
+                            parseFloat(_priceList[i].detailList[j].water)) /
+                            0.1) *
+                          parseFloat(_priceList[i].detailList[j + 1].jfprice)
+                        )
+                        this.leftFJPrice = baseprice
+                      }
+                    } else {
+                      baseprice = parseFloat(
+                        parseFloat(_priceList[i].basicUnitPrice) +
                         ((parseFloat(_priceList[i].detailList[j + 2].water) -
                           parseFloat(_priceList[i].detailList[j].water)) /
                           0.1) *
-                          parseFloat(_priceList[i].detailList[j + 1].jfprice)
-                    )
-                      }
+                        parseFloat(_priceList[i].detailList[j + 1].jfprice)
+                      )
+                    }
+
 
-                  
                   }
                   _leftObj.priceList.push({
                     index: j,
@@ -1760,36 +1769,36 @@ export default {
                   if (k == index) {
                     baseprice = parseFloat(_priceList[i].basicUnitPrice)
                   } else {
-                    if(_priceList[i].detailList[k].type==5){
+                    if (_priceList[i].detailList[k].type == 5) {
                       this.rightFJIndex++
-                      if(this.rightFJIndex==1){
+                      if (this.rightFJIndex == 1) {
                         baseprice = parseFloat(
-                      parseFloat(_priceList[i].basicUnitPrice) -
-                        ((parseFloat(_priceList[i].detailList[k].water) -
-                          parseFloat(_priceList[i].detailList[k - 2].water)) /
-                          0.1) *
+                          parseFloat(_priceList[i].basicUnitPrice) -
+                          ((parseFloat(_priceList[i].detailList[k].water) -
+                            parseFloat(_priceList[i].detailList[k - 2].water)) /
+                            0.1) *
                           parseFloat(_priceList[i].detailList[k - 1].jfprice)
-                    )
-                    this.rightFJPrice = baseprice
-                      }else if(this.rightFJIndex>1){
+                        )
+                        this.rightFJPrice = baseprice
+                      } else if (this.rightFJIndex > 1) {
                         baseprice = parseFloat(
-                      parseFloat(this.rightFJPrice) -
-                        ((parseFloat(_priceList[i].detailList[k].water) -
-                          parseFloat(_priceList[i].detailList[k - 2].water)) /
-                          0.1) *
+                          parseFloat(this.rightFJPrice) -
+                          ((parseFloat(_priceList[i].detailList[k].water) -
+                            parseFloat(_priceList[i].detailList[k - 2].water)) /
+                            0.1) *
                           parseFloat(_priceList[i].detailList[k - 1].jfprice)
-                    )
-                    this.rightFJPrice = baseprice
+                        )
+                        this.rightFJPrice = baseprice
                       }
-                    }else{
-                      
-                    baseprice = parseFloat(
-                      parseFloat(_priceList[i].basicUnitPrice) -
+                    } else {
+
+                      baseprice = parseFloat(
+                        parseFloat(_priceList[i].basicUnitPrice) -
                         ((parseFloat(_priceList[i].detailList[k].water) -
                           parseFloat(_priceList[i].detailList[k - 2].water)) /
                           0.1) *
-                          parseFloat(_priceList[i].detailList[k - 1].jfprice)
-                    )
+                        parseFloat(_priceList[i].detailList[k - 1].jfprice)
+                      )
                     }
 
                   }
@@ -1833,7 +1842,7 @@ export default {
                     }
                     baseprice = parseFloat(
                       parseFloat(this.baseInfoForm.dryGrainPrice) *
-                        (1 - waterCount)
+                      (1 - waterCount)
                     )
                   }
                   _rightObj.priceList.push({
@@ -1848,10 +1857,10 @@ export default {
                         (parseFloat(_priceList[i].detailList[k + 2].water) -
                           parseFloat(_priceList[i].detailList[k].water)) *
                         parseFloat(_priceList[i].detailList[k + 1].jfprice)) /
-                        100 /
-                        ((parseFloat(_priceList[i].detailList[k + 2].water) -
-                          parseFloat(_priceList[i].detailList[k].water)) /
-                          0.1)
+                      100 /
+                      ((parseFloat(_priceList[i].detailList[k + 2].water) -
+                        parseFloat(_priceList[i].detailList[k].water)) /
+                        0.1)
                     ),
                     baseprice: baseprice,
                     price:
@@ -1896,11 +1905,10 @@ export default {
       }
     },
     // 获取当前价格左右价格区间数据
-    getOtherPrice(list, water, direction) {},
+    getOtherPrice(list, water, direction) { },
     calculatePriceRight(_waterMax) {
       //获取每个分界值
       let _listResult = []
-      debugger
       for (let i = 0; i < this.right.length; i++) {
         let _list = this.right[i].priceList
         let tmp = {}
@@ -1912,7 +1920,7 @@ export default {
             tmp.level = this.left[i].level
             tmp.val = parseFloat(
               _list[k].baseprice -
-                _list[k].jfprice * ((_waterMax - _list[k].priceStart) / 0.1)
+              _list[k].jfprice * ((_waterMax - _list[k].priceStart) / 0.1)
             )
           }
         }
@@ -1934,7 +1942,7 @@ export default {
             tmp.level = this.left[i].level
             tmp.val = parseFloat(
               _list[k].baseprice +
-                _list[k].jfprice * ((_list[k].priceStart - _waterMax) / 0.1)
+              _list[k].jfprice * ((_list[k].priceStart - _waterMax) / 0.1)
             )
           }
         }
@@ -1951,7 +1959,6 @@ export default {
       let _pointPrice = []
       let _basePrice = 0
       if (this.baseInfoForm.bulkDensityStandard == 1) {
-        this.isSolidFood = false
         // this.isSolidFood = true
         //以容重查看
         _pointPrice = _priceList[0].pointPrice.split(',')
@@ -2058,7 +2065,7 @@ export default {
   border-color: #5878e8;
 }
 
-.el-checkbox__input.is-checked + .el-checkbox__label {
+.el-checkbox__input.is-checked+.el-checkbox__label {
   color: #5878e8;
 }
 
@@ -2244,26 +2251,23 @@ export default {
         top: 72px;
         width: 100%;
         height: 5px;
-        background: linear-gradient(
-          39deg,
-          #e6eeff 0%,
-          #91b0f5 42%,
-          #5878e8 100%
-        );
+        background: linear-gradient(39deg,
+            #e6eeff 0%,
+            #91b0f5 42%,
+            #5878e8 100%);
         border-radius: 3px;
       }
+
       .line1 {
         position: absolute;
         top: 72px;
         width: 100%;
         height: 5px;
-        margin-left:16px;
-        background: linear-gradient(
-          39deg,
-          #5878e8 0%,
-          #91b0f5 42%,
-          #e6eeff 100%
-        );
+        margin-left: 16px;
+        background: linear-gradient(39deg,
+            #5878e8 0%,
+            #91b0f5 42%,
+            #e6eeff 100%);
         border-radius: 3px;
       }
 
@@ -2356,14 +2360,15 @@ export default {
 .white-bgc {
   background: white !important;
 }
+
 .jt-style1 {
-        position: absolute;
-        top: 64px;
-        width: 0px;
-        height: 0px;
-        // right: -15px;
-        border-right: 15px solid #5473e8;
-        border-top: 10px solid transparent;
-        border-bottom: 10px solid transparent;
-      }
+  position: absolute;
+  top: 64px;
+  width: 0px;
+  height: 0px;
+  // right: -15px;
+  border-right: 15px solid #5473e8;
+  border-top: 10px solid transparent;
+  border-bottom: 10px solid transparent;
+}
 </style>

src/views/outboundManagement/weighingManagementrecord.vue

@@ -96,7 +96,7 @@
     </el-table>
     <div style="text-align: center">
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
+        :page-sizes="[20, 30, 50, 100, 500, 1000, 9999]" layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal">
       </el-pagination>
     </div>
@@ -220,7 +220,7 @@
         //分页
         dialogViewSpareMoney: false,
         currentPage: 1,
-        pageSize: 10,
+        pageSize: 20,
         inspect:{},
         deptCircularPage: {},
         deptBudgetTotal: 0,

src/views/profitable/cashout.vue

@@ -67,6 +67,7 @@
           </el-form-item>
           <el-form-item label-width='100px' label="附件">
             <ws-upload ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
+            :limit="99"
         @onChange="onChange" 
        />
           <!-- <el-upload ref='uploadfiles' :file-list='dataList' :action="global.uploadPath" :on-preview="Previewf"

src/views/profitable/cashoutaduitNQ.vue

@@ -49,7 +49,8 @@
             </el-input>
           </el-form-item>
           <el-form-item label-width='100px' label="附件">
-            <ws-upload ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
+            <ws-upload ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl"
+            :limit="99" :size-limit="size"
         @onChange="onChange" 
        />
         </el-form-item>