前端

src/api/V2/profitable/index.js

@@ -20,5 +20,11 @@ export const API_POST_AUDITRECORD = '/billOperateHis/query/commonBillOperateHis'
 export const API_GET_WAREHOUSE = '/warehouseBaseInfo/selectWarehouse'
 // 费用管理提交
 export const API_POST_SUBMIT = '/feeDetailsInfo/submit'
+// 费用管理查看
+export const API_GET_LOOK = '/feeDetailsInfo/selectInfo'
+// 费用管理付款，确认付款
+export const API_POST_SUBMITPAY = '/feeDetailsInfo/submitPay'
+// 费用管理编辑 、 收款、付款
+export const API_POST_SHOUGUAN = '/feeDetailsInfo/payShou'
 //合同编号下拉
 export const API_GET_WAREHOUSE_NO = '/warehouseBaseInfo/selectContractNoList'

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -45,7 +45,9 @@
       <el-table-column prop="deductWeight" label="扣重比"></el-table-column>
       <el-table-column prop="saleLimit" label="销量上限(年/吨)"></el-table-column>
       <el-table-column prop="dryGrainPrice" label="干粮收购价"></el-table-column>
-      <el-table-column prop="status" label="状态"></el-table-column>
+      <el-table-column prop="status" label="状态">
+        
+      </el-table-column>
       <el-table-column prop="updateDate" label="通过时间"></el-table-column>
       <el-table-column label="操作" width="300">
         <template slot-scope="scope">

src/views/houseSelfCollect/paymentManagement.vue

@@ -473,22 +473,16 @@
         appendixIdsAdd: '',
         excelFreightspace: [],
         goodnameList:[],
-        goodsName:'全部',
+        goodsName:"全部",
       }
     },
-    mounted() {debugger
+    activated() {
       this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
-
+      
       this.getPassYearFormatDate()
       this.getWarehouse()
+      // this.getList()
     },
-    // activated() {
-    //   this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
-
-    //   this.getPassYearFormatDate()
-    //   this.getWarehouse()
-    //   // this.getList()
-    // },
     updated() {
 
       this.$nextTick(() => {
@@ -574,7 +568,6 @@
               obj.netWeight = v.净重
               obj.dryGrainPrice = v.单价
               obj.qualityDate = _this.formatDate(v.日期,'-')
-              obj.deductionAmount = v.扣款
               _this.excelFreightspace.push(obj)
             })
             if (_this.excelFreightspace) {
@@ -800,7 +793,7 @@
             if (response.length > 0) {
               var arr = []
               for (let i = 0; i < response.length; i++) {
-                let _name = response[i].replace('https://taohaoliang.oss-cn-beijing.aliyuncs.com/FP/','')
+                let _name = response[i].replace('https://taohaoliang.oss-cn-beijing.aliyuncs.com/FP/',"")
                 arr.push({
                   fileUrl: response[i],
                   renameFileName: _name,
@@ -1261,7 +1254,7 @@
             managementType: 1,
             invoicing: this.invoicing,
             compId: localStorage.getItem('ws-pf_compId'),
-            goodsName:this.goodsName == '全部'?'':this.goodsName
+            goodsName:this.goodsName == '全部'?"":this.goodsName
           })
           .toPromise()
           .then((response) => {
@@ -1325,6 +1318,7 @@
               id: row.id,
             },
           })
+          
         }
       },
       payment() {

src/views/outboundManagement/component/outInspectPrint.vue

@@ -15,7 +15,7 @@
         <td class="col col-bgc">发货单位</td>
         <td class="col" colspan="2">{{ printData.contractManagement ? printData.contractManagement.seller:"" }}</td>
         <td class="col col-bgc">联系人</td>
-        <td class="col" colspan="2">{{ printData.contractManagement ? printData.contractManagement.feedbackLeader:"" }}</td>
+        <td class="col" colspan="2">{{ printData.contractManagement ? printData.contractManagement.wo1kan:"" }}</td>
         <td class="col col-bgc">联系电话</td>
         <td class="col">{{ printData.contractManagement ? printData.contractManagement.sellerPhone:"" }}</td>
       </tr>
@@ -39,7 +39,7 @@
         <td v-if="printData.contractManagement.priceType == '定价销售'" class="col col-bgc">单价（元/公斤）</td>
         <td v-else class="col col-bgc">待定单价（元/公斤）</td>
         <!-- <td v-if="printData.type == '潮粮'" class="col">{{ printData.tidalGrainPrice }}</td> -->
-        <td class="col">{{ contractManagement ? printData.contractManagement.unitContractPrice:"" }}</td>
+        <td class="col">{{ printData.contractManagement ? printData.contractManagement.unitContractPrice:"" }}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">杂质（%）</td>

src/views/outboundManagement/weighingManagementNew.vue

@@ -262,8 +262,8 @@
           </el-col>
           <el-col :span="12">
             <div class="list-info">
-              <div style="justify-content: space-between;" class="flex">
-                <div style="min-width:146px;">
+              <div style="justify-content: space-between" class="flex">
+                <div>
                   <el-button v-if="tpyeNo == 1" @click="add" type="primary">新增</el-button>
                   <el-button v-if="tpyeNo == 1" @click="deletelist" type="danger">删除</el-button>
                   <el-button v-if="tpyeNo == 2" @click="statustypechangelist(3)"
@@ -1605,13 +1605,12 @@
         return date.getFullYear() + mouth + day
       },
       contractNoChange(e) {
-        debugger
         this.warehouseCount = this.warehouseCount1
         for (let i = 0; i < this.taskNolist.length; i++) {
           if (this.taskNolist[i].inOutTaskNo == e) {
             //  this.weighingList.number = this.taskNolist[i].inOutTaskNo
-              // this.warehouseCount = '000' + (Number(this.warehouseCount) + 1)
-              // this.weighingList.number = 'XSCK' + this.getTime() +  this.warehouseNo + this.warehouseCount.substring(this.warehouseCount.length - 4)
+              this.warehouseCount = '000' + (Number(this.warehouseCount) + 1)
+              this.weighingList.number = 'XSCK' + this.getTime() +  this.warehouseNo + this.warehouseCount.substring(this.warehouseCount.length - 4)
              this.weighingList.goodsName = this.taskNolist[i].goodsName
              this.weighingList.tips = this.taskNolist[i].businessDescribe
             var data = this.taskNolist[i]
@@ -1664,6 +1663,7 @@
               this.weighingList.goodsNameKey = data.goodsNameKey
               this.weighingList.grade = data.grade
               if (this.outContractNo[i].unitContractPrice) {
+                
                 this.weighingList.tips =
                   '入货库' +
                   data.receiveWarehouse +
@@ -2004,7 +2004,7 @@
     text-align: right;
     padding: 0 10px 0 20px;
     border-radius: 10px;
-    margin: 0 20px 20px 21px;
+    margin: 0 20px 20px 20px;
     position: absolute;
     top: 140px;
     width: 465px;

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -16,8 +16,7 @@
             style="vertical-align: bottom; margin-right: 3px"
             src="../../../public/img/lujing.png"
             alt=""
-          />返回</el-button
-        >
+          />返回</el-button>
       </el-col>
     </el-row>
     <ws-form ref="deptBudgetList" :v-model="deptBudgetList">

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -951,6 +951,9 @@ export default {
             this.tranCarInfoList=this.outContractNo[i].tranCarInfoList
             this.carstatus=true
           }
+          if(this.outContractNo[i].shipInfoList){
+               this.shipInfoList = this.outContractNo[i].shipInfoList
+            }
         }
       }
     },

src/views/warehouse/warehouseManagementRecord.vue

@@ -302,7 +302,7 @@
             </el-option>
           </el-select>
         </div>
-        <div v-if="deptBudgetList.warehouseName=='鲅鱼圈金信库'||deptBudgetList.warehouseName=='白城内陆港'||deptBudgetList.warehouseName=='哈尔滨依兰库'">
+        <div v-if="deptBudgetList.warehouseName=='鲅鱼圈金信库'||deptBudgetList.warehouseName=='白城内陆港'">
           <div class="print-type-ew">
             <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
             <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
@@ -456,8 +456,8 @@
           label: '厦门建发物产有限公司'
         }],
         companyName: '黑龙江利润元粮食贸易有限公司',
-        companyNameEW: '厦门建发物产有限公司',
-        ewCustomer: '黑龙江利润元粮食贸易有限公司',
+        companyNameEW: "厦门建发物产有限公司",
+        ewCustomer: "黑龙江利润元粮食贸易有限公司",
         ddchecked: false,
         checked: false,
         isShowPrintType: false,
@@ -466,7 +466,6 @@
         deptBudgetTotal: 0,
         currentPage: 1,
         pageSize: 10,
-        capacity: '',
         contractType: 2,
         // 提交类型
         submitType: true,
@@ -494,7 +493,7 @@
         modification: [],
         printList: [], //批量打印数据
         onePrint: false, //单个打印开关
-        idPrint:'',
+        idPrint:"",
       }
     },
 
@@ -509,9 +508,6 @@
       this.getList()
       this.getPassYearFormatDate()
       this.showType = this.isShow
-      if(this.binNumber == '全部仓位'){
-        this.deptBudgetList.positionId = ''
-      }
     },
     updated() {
       this.$nextTick(() => {
@@ -528,6 +524,7 @@
         }
       },
       changeEw(e) {
+        debugger
         this.ddchecked = false
 
         if (e) {
@@ -546,31 +543,32 @@
         localStorage.setItem('ewWarehouseBatchPrint', JSON.stringify(_printList))
       },
       async typePrintClick() {
+        debugger
         this.printList = []
-        // if (this.onePrint) {
-        //   sessionStorage.removeItem('ck_bd_printData')
-        //   getPrintInfo({
-        //       id: this.idPrint
-        //     })
-        //     .toPromise()
-        //     .then((response) => {
-        //       if (response) {
-        //         if (this.checked || this.ddchecked) {
-        //           var arrayPrint = response
-        //           // for (let i = 0; i < arrayPrint.length; i++) {
-        //             // let _data = arrayPrint[i];
-        //             arrayPrint.companyName = this.companyNameEW;
-        //             arrayPrint.customer = this.ewCustomer
-        //           // }
-        //           localStorage.setItem('ck_bd_printData', JSON.stringify(arrayPrint))
-        //           window.open('../../../../static/weightCheckInOut.html?type=2')
-        //           return
-        //         }
-        //         localStorage.setItem('ck_bd_printData', JSON.stringify(response))
-        //         window.open('../../../../static/weightCheckInOut.html?type=2')
-        //       }
-        //     })
-        // } else {
+        if (this.onePrint) {
+          sessionStorage.removeItem('ck_bd_printData')
+          getPrintInfo({
+              id: this.idPrint
+            })
+            .toPromise()
+            .then((response) => {
+              if (response) {
+                if (this.checked || this.ddchecked) {
+                  var arrayPrint = response
+                  // for (let i = 0; i < arrayPrint.length; i++) {
+                    // let _data = arrayPrint[i];
+                    arrayPrint.companyName = this.companyNameEW;
+                    arrayPrint.customer = this.ewCustomer
+                  // }
+                  localStorage.setItem('ck_bd_printData', JSON.stringify(arrayPrint))
+                  window.open('../../../../static/weightCheckInOut.html?type=2')
+                  return
+                }
+                localStorage.setItem('ck_bd_printData', JSON.stringify(response))
+                window.open('../../../../static/weightCheckInOut.html?type=2')
+              }
+            })
+        } else {
           var count = 0
           for (var i = 0; i < this.modification.length; i++) {
             await getPrintInfo({
@@ -586,14 +584,14 @@
                     this.makeEWjjSelectPrintList()
                     //  this.selectEW = true;
                   }
-                  localStorage.setItem('warehouseBatchPrint', JSON.stringify(this.printList))
+                  localStorage.setItem("warehouseBatchPrint", JSON.stringify(this.printList))
                   window.open('../../../../static/warehouseBatchPrint.html?selectEW=' + this.checked +
                     '&selectEWDD=' + this.ddchecked)
                 }
               })
 
           }
-        // }
+        }
 
 
 
@@ -680,9 +678,10 @@
 				
 			// },
       batchPrint() {
+      
         this.printList = []
         if (this.modification.length == 0) {
-          this.$message.error('请勾选要打印的条目！')
+          this.$message.error("请勾选要打印的条目！")
         } else {
 
           this.isShowPrintType = true
@@ -710,7 +709,7 @@
       },
       handleSelectionChange(val) {
         this.modification = val
-        console.log('sfasa', this.modification)
+        console.log("sfasa", this.modification)
       },
       selectInit(row){
 				 //在这里一定要记得类型匹配的上。
@@ -803,28 +802,9 @@
         this.value2 = [formatDate, nowData] // 默认赋值一年时间
       },
       print(row) {
-        // this.onePrint = true
-        // this.isShowPrintType = true
-        // this.idPrint = row.id
-         sessionStorage.removeItem('ck_bd_printData')
-          getPrintInfo({
-              id: row.id
-            })
-            .toPromise()
-            .then((response) => {
-              if (response) {
-                // if (this.checked || this.ddchecked) {
-                //   var arrayPrint = response
-                //     arrayPrint.companyName = this.companyNameEW;
-                //     arrayPrint.customer = this.ewCustomer
-                //   localStorage.setItem('ck_bd_printData', JSON.stringify(arrayPrint))
-                //   window.open('../../../../static/weightCheckInOut.html?type=2')
-                //   return
-                // }
-                localStorage.setItem('ck_bd_printData', JSON.stringify(response))
-                window.open('../../../../static/weightCheckInOut.html?type=2')
-              }
-            })
+        this.onePrint = true
+        this.isShowPrintType = true
+        this.idPrint = row.id
 
       },
       //返回按钮