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

@@ -199,12 +199,12 @@
                     maxlength="10" size="small" />
                 </ws-form-item>
 
-                <ws-form-item v-if='deptBudgetList.outType == "移库入库" && serviceManagementType == 1' label="移库编号"
+                <ws-form-item v-if='deptBudgetList.inOutType == "移库入库" && serviceManagementType == 1' label="移库编号"
                   span="1" prop="contractNo">
                   <ws-input v-model="deptBudgetList.contractNo" placeholder="自动获取，不可编辑" maxlength="100" disabled
                     size="small" />
                 </ws-form-item>
-                <ws-form-item v-if='deptBudgetList.outType != "移库入库" && serviceManagementType == 1' label="合同编号"
+                <ws-form-item v-if='deptBudgetList.inOutType != "移库入库" && serviceManagementType == 1' label="合同编号"
                   span="1" prop="contractNo">
                   <ws-input v-model="deptBudgetList.contractNo" placeholder="自动获取，不可编辑" maxlength="100" disabled
                     size="small" />
@@ -275,11 +275,11 @@
                       :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-input :disabled="disabled2"
-                    v-if="options2.length == 0 && serviceManagementType == 1 || serviceManagementType == 3 && carNumberList.length == 0"
+                <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" />
-                  <el-select :disabled="disabled2" v-if="carstatus && options2.length > 0 && serviceManagementType != 3"
+                  <el-select :disabled="disabled2" v-if="carstatus && options2.length > 0 && serviceManagementType != 3||carstatus && options2.length == 0 && serviceManagementType != 3&&deptBudgetList.inOutType=='移库入库' "
                     filterable clearable v-model="deptBudgetList.carNo1" placeholder="请选择车牌号" class="typeselect"
                     @change="carChange($event, 0)">
                     <el-option v-for="(item, index) in options2" :key="index"
@@ -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>
@@ -321,14 +321,14 @@
                   <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
                           size="small" />
                 </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 == '集装箱船'">
                   <el-select filterable clearable v-model="deptBudgetList.shipName"
                     placeholder="请选择船名" class="typeselect" @change="shipInfoChange($event)">
                     <el-option v-for="item in shipInfoList" :key="item.constKey" :label="item.shipName"
                       :value="item.shipName" />
                   </el-select>
                 </ws-form-item>
-                <ws-form-item label="航次" span="1" prop="shipNumber" v-if="deptBudgetList.outType == '散船'">
+                <ws-form-item label="航次" span="1" prop="shipNumber" v-if="deptBudgetList.outType == '散船'||deptBudgetList.outType == '集装箱船'">
                   <ws-input disabled v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
                 </ws-form-item>
                 <ws-form-item label="箱号-1" span="1" prop="boxNo"
@@ -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()

src/views/outboundManagement/weighingManagementNew.vue

@@ -200,7 +200,7 @@
                         <ws-input v-model="weighingList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
                           size="small" />
                       </ws-form-item>
-                      <ws-form-item label="船名" span="1" prop="shipName" v-if="weighingList.outType == '散船'">
+                      <ws-form-item label="船名" span="1" prop="shipName" v-if="weighingList.outType == '散船'||weighingList.outType == '集装箱船'">
                         <!-- <ws-input v-model="weighingList.shipName" placeholder="请输入船名" maxlength="20" size="small" /> -->
                         <el-select :disabled="tpyeNo == 2" filterable clearable v-model="weighingList.shipName"
                           placeholder="请选择船名" class="typeselect" @change="shipInfoChange($event)">
@@ -208,7 +208,7 @@
                             :value="item.shipName" />
                         </el-select>
                       </ws-form-item>
-                      <ws-form-item label="航次" span="1" prop="shipNumber" v-if="weighingList.outType == '散船'">
+                      <ws-form-item label="航次" span="1" prop="shipNumber" v-if="weighingList.outType == '散船'||weighingList.outType == '集装箱船'">
                         <ws-input disabled v-model="weighingList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
                       </ws-form-item>
                       <ws-form-item v-if="tpyeNo == 2" label="毛重(KG)" span="1" prop="grossWeight">

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 }}元
@@ -72,7 +82,7 @@
       </div>
 
       <el-table class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px"
-        ref="warehouseList.records" border @row-click="handleRowClick" @selection-change="handleSelectionChange">
+        ref="warehouseList.records" @row-click="handleRowClick" @selection-change="handleSelectionChange">
         <!-- <el-table-column
           :selectable="selectInit"
           type="selection"
@@ -206,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">
@@ -228,6 +247,7 @@
     getYunShuXiaLa,
     getYunShuNumber,
     SetYunShuPrice,
+    edittrantask
   } from '@/model/statisticalReport/index'
   import {
     posthandle
@@ -263,6 +283,7 @@
         checked: true,
         alreadyInvoice: '',
         needReapply: true,
+        taskform:{},
         dialogFormVisible1: false,
         dialogFormVisible2: false,
         dialogFormVisible3: false,
@@ -273,7 +294,7 @@
         dialogFormVisible8: false,
         dialogFormVisible11: false,
         dialogVisible: false,
-
+        shippedWeight:0,
         form: {
           transactionPrice: '',
           transactionsNumber: '',
@@ -364,7 +385,9 @@
           paymentScreenshot: '',
           id: '',
         },
-
+        shipName:'',
+        shipNo:'',
+        editshow:true,
         amountNotPayable: 0,
         amountEdPayable: 0,
         paymentScreenshotUrls: [],
@@ -386,6 +409,9 @@
       this.showType = this.isShow
     },
     methods: {
+      handlefeedback(){
+        this.editshow=true
+      },
       find(){
       this.getList()
     },
@@ -920,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()
             }
           })
@@ -927,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=='采购入库'){