前端

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()

src/views/statisticalReport/shippingList.vue

@@ -52,7 +52,7 @@
         </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>
@@ -93,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="卸车净重(吨)">
@@ -218,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">
@@ -240,6 +247,7 @@
     getYunShuXiaLa,
     getYunShuNumber,
     SetYunShuPrice,
+    edittrantask
   } from '@/model/statisticalReport/index'
   import {
     posthandle
@@ -275,6 +283,7 @@
         checked: true,
         alreadyInvoice: '',
         needReapply: true,
+        taskform:{},
         dialogFormVisible1: false,
         dialogFormVisible2: false,
         dialogFormVisible3: false,
@@ -285,7 +294,7 @@
         dialogFormVisible8: false,
         dialogFormVisible11: false,
         dialogVisible: false,
-
+        shippedWeight:0,
         form: {
           transactionPrice: '',
           transactionsNumber: '',
@@ -378,6 +387,7 @@
         },
         shipName:'',
         shipNo:'',
+        editshow:true,
         amountNotPayable: 0,
         amountEdPayable: 0,
         paymentScreenshotUrls: [],
@@ -399,6 +409,9 @@
       this.showType = this.isShow
     },
     methods: {
+      handlefeedback(){
+        this.editshow=true
+      },
       find(){
       this.getList()
     },

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=='采购入库'){