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

src/views/houseSelfCollect/inspectInfo.vue

@@ -103,9 +103,6 @@
                 :disabled="disabled" />
             </ws-form-item>
           </ws-info-table>
-          <!-- <div style="text-align: right; color: #323233">
-            潮粮单价（元/公斤）：{{ unitPrice}}
-          </div> -->
           <div class="but">
             <el-button @click="cancel" v-if="this.types != 2" type="primary">取消</el-button>
             <el-button @click="print" v-if="this.types != 2" type="primary">保存并打印</el-button>
@@ -234,9 +231,7 @@
       calculation() {
         let number = '000' + this.count
         number = number.substring(number.length - 4, number.length)
-        this.inspect.qualityNo = 'ZCRK' + this.getdate() + this.cangNo + number //SGRK+8位时间+3位仓库编号+4位序列号
-        
-        // + this.verifyinit()
+        this.inspect.qualityNo = 'ZCRK' + this.getdate() + this.cangNo + number //ZCRK+8位时间+3位仓库编号+4位序列号
       },
       closeDialog() {
         html2canvas(this.$refs.saveImg.$el).then(canvas => {

src/views/houseSelfCollect/inspectionManagement.vue

@@ -71,6 +71,7 @@
       <el-table-column
         prop="tidalGrainPrice"
         label="单价（元/公斤）"
+        width="120px"
       ></el-table-column>
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>

src/views/houseSelfCollect/paymentManagement.vue

@@ -187,8 +187,6 @@ import {
 import { posthandle } from '@/model/purchasingManagement/index'
 import paymentPrint from './component/paymentPrint.vue'
 import { getHp } from '@/utils/getHasPermission'
-// import Warehouse from './common.js'
-// import Warehouse from '@/main.js'
 export default {
   components: { paymentPrint },
   watch: {},
@@ -224,18 +222,6 @@ export default {
   },
   activated() {
     this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
-    // selectWarehouseSelf({
-    //   compId: sessionStorage.getItem('ws-pf_compId'),
-    // })
-    //   .toPromise()
-    //   .then((response) => {
-
-    //     this.warehouseList = response
-    //     this.warehouseNameKey = this.warehouseList[0].id
-    //     this.warehouseName = this.warehouseList[0].warehouseName
-    //     this.WAREHOUSE[3].payname = this.warehouseList[0].warehouseName
-    //     this.getList()
-    //   })
     this.getWarehouse()
     // this.getList()
   },
@@ -253,6 +239,7 @@ export default {
           that.audit(this.modification[0], 0, true, 2)
         })
       }
+      
     },
     getWarehouse() {debugger
       selectWarehouseSelf({
@@ -300,28 +287,25 @@ export default {
       })
         .toPromise()
         .then(response => {
-          debugger
           this.paymentList = response
           this.deptBudgetTotal = response.total
         })
         this.isShowAdopt = true
-    //  getpayment({
-    //     currentPage: 1,
-    //     pageSize: 99999,
-    //     warehouseName: this.warehouseName,
-    //     managementType : 1 
-    //   })
-    //     .toPromise()
-    //     .then((response) => {
-    //       for(let i = 0 ; i < response.length ; i++){
-    //         if(response[i].taskId){
-    //           this.isShowAdopt = true
-    //           return
-    //         }
-       
-    //       }
-       
-    //     })
+     getpayment({
+        currentPage: 1,
+        pageSize: 99999,
+        warehouseName: this.warehouseName,
+        managementType : 1 
+      })
+        .toPromise()
+        .then((response) => {
+          for(let i = 0 ; i < response.length ; i++){
+            if(response[i].taskId){
+              this.isShowAdopt = true
+              return
+            }
+          }
+        })
     },
     del(row) {
       this.$confirm(

src/views/houseSelfCollect/settlement.vue

@@ -395,9 +395,7 @@
         <!-- <el-button type="primary" @click="printSmall">打印小票</el-button> -->
         <el-button type="primary" @click="printBig">打印单据</el-button>
       </div>
-       
     </el-dialog>
-
   </div>
 </template>
 <script>
@@ -438,7 +436,6 @@ export default {
          this.information = '结算'   
     }
    this.getList()
- 
   },
   methods: {
     closeDialog(){
@@ -463,7 +460,6 @@ export default {
           this.dialogTableVisible = true
         }
       })
-
     },
     printSmall() {
       window.open('../../../../../static/payprint.html?type=1&dataList=' +JSON.stringify(this.printData))
@@ -482,6 +478,8 @@ export default {
          this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
          this.paymentList.base = this.paymentList.base.toFixed(2)
           this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
+          console.log(this.paymentList.base,",s;,l;p")
+          console.log(this.paymentList.weighingManagement.netWeight)
            this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
           if(!this.paymentList.solidGrainPrice){
             this.paymentList.solidGrainPrice=this.paymentList.qualityInspectionManagement.tidalGrainPrice/this.paymentList.base
@@ -494,7 +492,8 @@ export default {
               this.paymentList.actualPayment = this.paymentList.calculationPayable
               this.actualPayment( this.paymentList.actualPayment)
           }else{
-            // this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.solidGrainPrice*this.paymentList.weighingManagement.netWeight
+            
+            this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.dryGrainPrice * this.paymentList.netWeight
              this.paymentList.calculationPayable=Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy)-Number(this.paymentList.weighingDeduction)-this.paymentList.freightDeduction-Number(this.paymentList.unloadDeduction)-Number(this.paymentList.otherDeduction)-Number(this.paymentList.qualityDeduction)
               this.paymentList.calculationPayable =  this.paymentList.calculationPayable.toFixed(2)
                 this.paymentList.actualPayment = this.paymentList.calculationPayable

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/',