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

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -51,7 +51,7 @@
           <template slot-scope="scope">
             <el-button size="mini" @click="newAcquisition(scope.$index, scope.row,'查看')">查看</el-button>
             <el-button v-if="scope.row.status!='审核中'" size="mini" @click="newAcquisition(scope.$index, scope.row,'编辑')" v-hasPermission=" `acquisitionManagement.acquisitionCustomer.edit`">编辑</el-button>
-            <el-button v-if="scope.row.status=='审核中'" size="mini" :disabled="!userJurisdictionAudit" @click="newAcquisition(scope.$index, scope.row,'审核中')">审核中</el-button>
+            <el-button v-if="scope.row.status=='审核中'" size="mini" :disabled="!scope.row.taskId" @click="newAcquisition(scope.$index, scope.row,'审核中')">审核中</el-button>
             <el-button size="mini" :disabled="!userJurisdiction" type="danger" @click="delRow(scope.$index, scope.row)" v-hasPermission=" `acquisitionManagement.acquisitionCustomer.delete`">删除</el-button>
             <el-button size="mini" @click="print(scope.$index, scope.row)">打印</el-button>
           </template>

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -901,7 +901,7 @@
         }
       },
       // 获取当前价格左右价格区间数据
-      getOtherPrice(list, nowList, direction) {
+      getOtherPrice(list, nowList, direction) {debugger
         //判断当前价格左右各有几个分界，返回当前除当前分界其他分界价格和
         let _left = []
         let _right = []
@@ -948,7 +948,7 @@
         return _leftTotalPrice + _rightTotalPrice
       },
       // 计算价格
-      calculatePrice(_waterMin) {
+      calculatePrice(_waterMin) {debugger
         let prcieList = []
         let totalPrice = []
         let _price = 0