Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -45,7 +45,7 @@
       <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 prop="approveStatus" label="状态">
         
       </el-table-column>
       <el-table-column prop="updateDate" label="通过时间"></el-table-column>
@@ -55,7 +55,7 @@
           <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="!scope.row.taskId"
-            @click="newAcquisition(scope.$index, scope.row,'审核中')">{{scope.row.approveStatus}}</el-button>
+            @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>

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -275,7 +275,7 @@
                       :value="item.fleetName" />
                   </el-select>
                 </ws-form-item>
-                <ws-form-item v-if="serviceManagementType == 1&&deptBudgetList.outType != '散船'&&deptBudgetList.outType != '火运'" label="车牌号" span="1" prop="carNo">
+                <ws-form-item v-if="serviceManagementType == 1&&deptBudgetList.outType == '汽运'" label="车牌号" span="1" prop="carNo">
                  <ws-input :disabled="disabled2"
                     v-if="options2.length == 0 && serviceManagementType == 1&&deptBudgetList.inOutType!='移库入库' || serviceManagementType == 3 && carNumberList.length == 0"
                     v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
@@ -310,7 +310,7 @@
                       top: -1px;
                     " src="../../../public/img/edit.png" @click="editClick(3)" alt="" /> -->
                 </ws-form-item>
-                <ws-form-item label="车牌号" span="1" prop="shipName" v-if="deptBudgetList.outType == '散船'">
+                <ws-form-item label="车牌号" span="1" prop="shipName" v-if="deptBudgetList.outType == '散船'||deptBudgetList.outType == '集装箱船'">
                   <ws-input 
                     v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
                 </ws-form-item>
@@ -454,7 +454,7 @@
             :type="statusType == 2 ? 'primary' : ''">已复检
           </el-button>
           <el-table highlight-current-row @cell-click='listclick' :data="inspect" style="width: 100%; margin-top: 20px"
-            ref="inspect" border>
+            ref="inspect" >
             <el-table-column prop="qualityNo" width="160" label="业务编号"></el-table-column>
             <el-table-column prop="carNumber" label="车牌号">
               <template slot-scope="scope">
@@ -732,7 +732,6 @@ export default {
     this.fjJurisdiction= getHp('acquisitionManagement.acquisitionQuality.again')
     // 确认
     this.qrJurisdiction= getHp('acquisitionManagement.acquisitionQuality.con')
-    console.log(111111111)
     console.log(this.qyJurisdiction)
     //获取质检员权限
     this.getNowTime()
@@ -966,25 +965,8 @@ export default {
       this.deptBudgetList.customerPhone = customers[1].split(')')[0]
     },
     waterContentChange(type) {
-      if (this.deptBudgetList.goodsName && type != 'water') {
-        if (this.deptBudgetList.goodsName.indexOf('潮粮') != -1) {
-          this.deptBudgetList.type = '潮粮'
-        } else {
-          this.deptBudgetList.type = '干粮'
-        }
-        if (!this.deptBudgetList.dryGrainPrice || this.deptBudgetList.dryGrainPrice == 0) {
-          getDryGrainPrice({
-            warehouseId: this.cangid,
-            goodsName: this.deptBudgetList.goodsName
-          })
-            .toPromise()
-            .then((response) => {
-              this.$set(this.deptBudgetList, 'dryGrainPrice', response)
-            })
-        }
-        // debugger
-        //客户
-        if(this.serviceManagementType==3){
+          //客户
+          if(this.serviceManagementType==3){
           getcustomer({
             warehouseId: this.cangid,
             goodsName: this.deptBudgetList.goodsName
@@ -1008,7 +990,26 @@ export default {
               }
             })
         }
-        
+      if(this.deptBudgetList.inOutType=="收购入库"){ //收购入库  价格取至合同
+        return
+      }
+      if (this.deptBudgetList.goodsName && type != 'water') {
+        if (this.deptBudgetList.goodsName.indexOf('潮粮') != -1) {
+          this.deptBudgetList.type = '潮粮'
+        } else {
+          this.deptBudgetList.type = '干粮'
+        }
+        if (!this.deptBudgetList.dryGrainPrice || this.deptBudgetList.dryGrainPrice == 0) {
+          getDryGrainPrice({
+            warehouseId: this.cangid,
+            goodsName: this.deptBudgetList.goodsName
+          })
+            .toPromise()
+            .then((response) => {
+              this.$set(this.deptBudgetList, 'dryGrainPrice', response)
+            })
+        }
+        // debugger
         for (var i = 0; i < this.purchasePriceList.length; i++) {
           if (this.purchasePriceList[i].goodsName == this.deptBudgetList.goodsName) {
             this.$set(this.deptBudgetList, 'buckleWeightRatio', this.purchasePriceList[i].deductWeight)
@@ -1070,6 +1071,9 @@ export default {
            
           }
         });
+      }else{
+        if(this.deptBudgetList.inOutType=="收购入库"){ //收购入库  价格取至合同
+        return
       }else{
         getinspectLookUnitPrice({
           warehouseId: this.cangid,
@@ -1081,11 +1085,9 @@ export default {
             if(response){
              this.deptBudgetList.dryGrainPrice = response
             }
-
           })
+      } 
       }
-      
-
     },
     opendBtn() {
       html2canvas(this.$refs.saveImg.$el).then(canvas => {
@@ -1324,7 +1326,6 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          // debugger
           console.log(response)
           this.deptBudgetList = response
           if (this.statusTypetext == '复检') {
@@ -3328,6 +3329,15 @@ export default {
           var data = this.taskNolist[i]
           if (this.taskNolist[i].inOutType == '移库入库') {
             this.deptBudgetList.contractNo = this.taskNolist[i].moveTaskNo
+          }else if(this.taskNolist[i].inOutType == '收购入库'){
+            this.deptBudgetList.contractNo = this.taskNolist[i].contractNo
+            this.deptBudgetList.inOutType == this.taskNolist[i].inOutType
+            this.deptBudgetList.goodsName = this.taskNolist[i].goodsName
+            if(this.taskNolist[i].goodsName.indexOf("潮粮") != -1){  //收购从合同中带出货名  单价等信息  用货名是否带有潮粮字符来判断干潮类型
+              this.deptBudgetList.type = "潮粮"
+            }else{
+              this.deptBudgetList.type = "干粮"
+            }
           } else {
             if (this.taskNolist[i].contractNo) {
               // console.log(this.taskNolist[i])
@@ -3344,7 +3354,9 @@ export default {
         if (
           this.outContractNo[i].contractNo == this.deptBudgetList.contractNo
         ) {
-          console.log(this.outContractNo[i])
+          if(this.outContractNo[i].priceType == "定价收购"){
+            this.deptBudgetList.dryGrainPrice = Number(this.outContractNo[i].unitContractPrice/1000).toFixed(2)
+          }
           if(this.serviceManagementType==3){
             var arr=this.goodnameList.filter((item)=>{return item.goodsName==this.outContractNo[i].goodsName})
             console.log(arr)
@@ -3353,13 +3365,15 @@ export default {
               this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
             this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
             }else{
-              this.deptBudgetList.goodsName=''
-              this.deptBudgetList.goodsNameKey=''
-              this.$message({
-                message: `当前仓库未设置：`+this.outContractNo[i].goodsName,
-                type: 'warning',   
-              });
-              break;
+              if(this.deptBudgetList.inOutType!="收购入库"){
+                 this.deptBudgetList.goodsName=''
+                  this.deptBudgetList.goodsNameKey=''
+                  this.$message({
+                    message: `当前仓库未设置：`+this.outContractNo[i].goodsName,
+                    type: 'warning',   
+                  });
+                  break;
+              }
             }
           }else{
             this.shipInfoList=this.outContractNo[i].shipInfoList

src/views/statisticalReport/shippingList.vue

@@ -46,6 +46,16 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button> -->
         </el-col>
       </el-row>
+      <el-row>
+        <el-col style="padding-left: 15px" :span="6">
+          
+        </el-col>
+        <el-col :span="18">
+          <div v-if="contractNo!='全部合同'">
+            <span style="display:inline-block;margin-right:10px;">船名：{{shipName}}</span> <span style="display:inline-block;margin-right:10px;">航次：{{shipNo}}</span>  <div style="display:inline-block;margin-right:10px;"> 装船重量（吨）：<ws-button v-if="shippedWeight==0" type="primary" @click="handlefeedback()">反馈</ws-button></div>
+          </div>
+        </el-col>
+      </el-row>
       <div class="freightSet" v-if="processNo">
         <div style="display: flex; width: 200px; line-height: 30px">
           预计运费（元）：{{ tranPriceIng }}元
@@ -83,8 +93,6 @@
         <el-table-column class="table_td" prop="taskNo" label="运输任务"></el-table-column>
         <el-table-column class="table_td" prop="shipType" label="类型"></el-table-column>
         <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
-        <el-table-column class="table_td" prop="shipName" label="船名"></el-table-column>
-        <el-table-column class="table_td" prop="shipNumber" label="航次"></el-table-column>
         <el-table-column class="boxNo" prop="boxNo" label="箱号/仓位号"></el-table-column>
         <el-table-column class="table_td" prop="loadingWeight" label="装车净重（吨）"></el-table-column>
         <el-table-column class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
@@ -208,7 +216,16 @@
         <img style="width: 100px; height: 100px" :src="item" alt="" />
       </div>
     </WinseaContentModal>
-
+    <WinseaContentModal v-model="editshow" title="装船反馈"
+      @on-cancel="editshow = false">
+      <el-form :model="taskform">
+        <el-form-item label="重量（吨）" >
+          <el-input type='number' v-model="shippedWeight" autocomplete="off" placeholder="输入水单装船重量"></el-input>
+        </el-form-item>
+      </el-form>
+        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="enclosure" 
+				accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" />
+    </WinseaContentModal>
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="accessoryTFs = false">
       <div v-for="(item, index) in paymentScreenshotList" :key="index">
@@ -230,6 +247,7 @@
     getYunShuXiaLa,
     getYunShuNumber,
     SetYunShuPrice,
+    edittrantask
   } from '@/model/statisticalReport/index'
   import {
     posthandle
@@ -265,6 +283,7 @@
         checked: true,
         alreadyInvoice: '',
         needReapply: true,
+        taskform:{},
         dialogFormVisible1: false,
         dialogFormVisible2: false,
         dialogFormVisible3: false,
@@ -275,7 +294,7 @@
         dialogFormVisible8: false,
         dialogFormVisible11: false,
         dialogVisible: false,
-
+        shippedWeight:0,
         form: {
           transactionPrice: '',
           transactionsNumber: '',
@@ -366,7 +385,9 @@
           paymentScreenshot: '',
           id: '',
         },
-
+        shipName:'',
+        shipNo:'',
+        editshow:true,
         amountNotPayable: 0,
         amountEdPayable: 0,
         paymentScreenshotUrls: [],
@@ -388,6 +409,9 @@
       this.showType = this.isShow
     },
     methods: {
+      handlefeedback(){
+        this.editshow=true
+      },
       find(){
       this.getList()
     },
@@ -922,6 +946,9 @@
                 taskNoValue: response[i].taskNo,
                 processNo: response[i].tranProcessInfoList,
               })
+              this.taskNo=response[0].taskNo
+              this.shipName=response[0].shipName
+              this.shipNo=response[0].shipNo
               this.getList()
             }
           })
@@ -929,22 +956,23 @@
       },
       taskNochange(e) {
         this.taskNo = e
-        this.processNoList = []
-        this.processNo = ''
-        for (let i = 0; i < this.taskNoList.length; i++) {
-          if (e == this.taskNoList[i].taskNoValue) {
-            for (let j = 0; j < this.taskNoList.length; j++) {
-              this.processNoList.push({
-                processNoKey: i,
-                processNoValue: this.taskNoList[i].processNo[j].processNo,
-                actualFreight: this.taskNoList[i].processNo[j].actualFreight,
-                id: this.taskNoList[i].processNo[j].id,
-                tranPriceIng: this.taskNoList[i].processNo[j].tranPrice,
-                priceStatus: this.taskNoList[i].processNo[j].priceStatus,
-              })
-            }
-          }
-        }
+        this.getList()
+        // this.processNoList = []
+        // this.processNo = ''
+        // for (let i = 0; i < this.taskNoList.length; i++) {
+        //   if (e == this.taskNoList[i].taskNoValue) {
+        //     for (let j = 0; j < this.taskNoList.length; j++) {
+        //       this.processNoList.push({
+        //         processNoKey: i,
+        //         processNoValue: this.taskNoList[i].processNo[j].processNo,
+        //         actualFreight: this.taskNoList[i].processNo[j].actualFreight,
+        //         id: this.taskNoList[i].processNo[j].id,
+        //         tranPriceIng: this.taskNoList[i].processNo[j].tranPrice,
+        //         priceStatus: this.taskNoList[i].processNo[j].priceStatus,
+        //       })
+        //     }
+        //   }
+        // }
       },
       processNochange(e) {
         this.processNo = e

src/views/warehousenew/warehousingOrder.vue

@@ -785,8 +785,9 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             }
             
           }
+          item.summation=item.summation.toFixed(2)
           this.$forceUpdate()
-          console.log(val,item.summation,1111111111)
+          // console.log(val,item.summation,1111111111)
           this.multipleSelection1[item.id]=val
         //  this.multipleSelection=this.noRepeat(this.multipleSelection.concat(val))
         //  console.log(this.multipleSelection)
@@ -1406,7 +1407,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           }
           }
           
-          this.form.name=this.money
+          this.form.name=this.money.toFixed(2)
           this.currectdata=item
           if(moneyarr&&moneyarr.length>0){
             // if(moneyarr[0].inType=='采购入库'){