前端 sdy

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -114,7 +114,7 @@
       getUserJurisdiction(){
          this.userJurisdiction = getHp('acquisitionManagement.acquisition.view')
          this.userJurisdictionAllow =  getHp('acquisitionManagement.acquisition.allow')
-         this.userJurisdictionAudit = getHp('acquisitionManagement.acquisition.view')
+         this.userJurisdictionAudit = getHp('acquisitionManagement.acquisition.edit')
       },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -506,7 +506,6 @@
       },
       // 添加粮价设置
       newSetPrice() {
-        this.isCountShow = false
         let _newObj = {
           index: 0,
           checkList: [],
@@ -541,7 +540,7 @@
         this.priceList.push(_newObj)
       },
       // 删除价格组
-      delSetPrice(item, index) {
+      delSetPrice(item, index) {debugger
         let that = this
         this.checkList1 = []
         this.checkList2 = []
@@ -570,6 +569,7 @@
               });
             } else {
               that.priceList.splice(index, 1)
+              that.baseInfoForm.details.split(index,1)
             }
           })
           .catch(() => {
@@ -631,13 +631,11 @@
           if (typeof(_pointVal1) == "string") _pointVal1 = _pointVal1.length
           let _tobeVal1 = _val1 % point
           if (type == "waterBase") {
-
             if (_val1 <= max && _val1 >= min && _pointVal1 <= saveNum && _tobeVal1 == 0) {
               return false
             }
           }
           if (type == "deductWeight") {
-
             if (_val1 <= max && _val1 >= min && _pointVal1 <= saveNum) {
               return false
             }
@@ -752,7 +750,7 @@
         }
         return true
       },
-      getEditChecList(){
+      getEditCheckList(){
             let _data = this.baseInfoForm.details
             let _list = []
           for(let k = 0;k<_data.length;k++){
@@ -783,7 +781,7 @@
             }
             break;
           case "编辑":
-             this.getEditChecList()
+             this.getEditCheckList()
             isValidate = this.validate()
             if (isValidate) {
               purchasePriceEdit(this.baseInfoForm).toPromise().then((response) => {
@@ -791,7 +789,7 @@
               })
             }
             case "审核中":
-             this.getEditChecList()
+             this.getEditCheckList()
             isValidate = this.validate()
             if (isValidate) {
               purchasePriceEdit(this.baseInfoForm).toPromise().then((response) => {
@@ -801,6 +799,7 @@
                     confirmButtonText: '确定',
                     type: 'warning',
                   }).then(() => {
+                    //审核
                     that.audit(this.baseInfoForm,true,2)
                   })
               })
@@ -871,7 +870,7 @@
         this.tableData = _list
       },
       // 获取分界价格数据，构造分界价格区间数据
-      getSplitPrice() {debugger
+      getSplitPrice() {
         let _priceList = this.priceList
         for (let i = 0; i < _priceList.length; i++) {
           for (let k = 0; k < _priceList[i].checkList.length; k++) {
@@ -948,7 +947,7 @@
         return _leftTotalPrice + _rightTotalPrice
       },
       // 计算价格
-      calculatePrice(_waterMin) {debugger
+      calculatePrice(_waterMin) {
         let prcieList = []
         let totalPrice = []
         let _price = 0
@@ -966,8 +965,8 @@
                 prcieList.push(this.keepTwoDecimal(_price))
               } else if (_waterMin >= _list[k].priceStart && _waterMin < _list[k].priceEnd) {
                 // 当前区间段价格+其他区间段价格
-                let _otherPice = this.getOtherPrice(_list, _list[k], "leftBasic")
-                let _price1 = (_list[k].priceEnd - _waterMin) / 0.5 * _list[k].betweenPrice + _otherPice;
+                // let _otherPice = this.getOtherPrice(_list, _list[k], "leftBasic")
+                // let _price1 = (_list[k].priceEnd - _waterMin) / 0.5 * _list[k].betweenPrice + _otherPice;
                 prcieList.push(basePrice + _price1)
 
               }
@@ -985,8 +984,8 @@
                 prcieList.push(this.keepTwoDecimal(_price))
               } else if (_waterMin > _list[k].priceStart && _waterMin <= _list[k].priceEnd) {
                 // 当前段价格+其他段价格
-                let _otherPice2 = this.getOtherPrice(_list, _list[k], "rightBasic")
-                let _price2 = (_waterMin - _list[k].priceEnd) / 0.5 * _list[k].betweenPrice + _otherPice2;
+                // let _otherPice2 = this.getOtherPrice(_list, _list[k], "rightBasic")
+                // let _price2 = (_waterMin - _list[k].priceEnd) / 0.5 * _list[k].betweenPrice + _otherPice2;
                 prcieList.push(basePrice - _price2)
               }
             }

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -88,8 +88,12 @@
         </el-col>
       </el-row>
       <div v-if="contractNo != ''">
+        <span v-if="orderList.seller"
+          >卖方: {{ orderList.seller }} </span
+        >
+        <span v-else>卖方:--</span>
         <span v-if="orderList.goodsName">货名: {{ orderList.goodsName }}</span>
-        <span v-else>货名:——</span>
+        <span v-else>货名:--</span>
         
         <span v-if="orderList.weight"
           >合同重量: {{ orderList.weight }} 吨</span
@@ -530,6 +534,7 @@ export default {
     }
   },
   activated() {
+    this.getContractList()
     this.getList()
     this.showType = this.isShow
   },
@@ -649,7 +654,6 @@ export default {
     },
     //定金附件
     fujian() {
-      debugger
       if (this.orderList.depositUrl === null || this.orderList.depositUrl === '') {
         EventBus.$emit(
           'warning',
@@ -897,7 +901,6 @@ export default {
             }
           }
         }
-        console.log(this.addressUrlArray,'tyis')
       this.contractNo = e
       this.getList()
     },
@@ -962,7 +965,6 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          // debugger
           this.payingMoney = 0
           this.payedMoney = 0
           this.payNotMoney = 0
@@ -975,7 +977,9 @@ export default {
           this.deptBudgetTotal = response.total
           this.warehouseList = response
         })
-      getStockPurchaseContractNoList({
+    },
+    getContractList(){
+       getStockPurchaseContractNoList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
@@ -986,7 +990,7 @@ export default {
         .then((response) => {
           this.contractNoList = response
           this.option = this.contractNoList
-        
+       this.contractNo = this.option[0].contractNo
         })
     },
     handleRemove(file) {