前端

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -323,13 +323,13 @@
                 </ws-form-item>
                 <ws-form-item label="船名" span="1" prop="shipName" v-if="deptBudgetList.outType == '散船'">
                   <el-select filterable clearable v-model="deptBudgetList.shipName"
-                    placeholder="请选择船名" class="typeselect" @change="shipInfoChange($event, 1)">
-                    <el-option v-for="item in shipInfoList" :key="item.constKey" :label="item.carNo"
-                      :value="item.carNo" />
+                    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-input v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
+                  <ws-input disabled v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
                 </ws-form-item>
                 <ws-form-item label="箱号-1" span="1" prop="boxNo"
                   v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船'">
@@ -770,6 +770,13 @@ export default {
     }
   },
   methods: {
+    shipInfoChange(e){
+        for (let i = 0; i < this.shipInfoList.length; i++) {
+          if(this.shipInfoList[i].shipName==this.weighingList.shipName){
+            this.weighingList.shipNumber=this.shipInfoList[i].shipNo
+          } 
+        }
+      },
     fleetNameChange(e){
         console.log(e,this.fleetNameList)
         if(e=='非车队'){

src/views/profitable/storageCharge.vue

@@ -178,7 +178,7 @@
           .then(response => {
             if(response.records.length>0){
               for (let i = 0; i < response.records.length; i++) {
-                response.records[i].money=response.records[i].amountMoney-response.records[i].unallocatedAmount
+                response.records[i].money=(response.records[i].amountMoney-response.records[i].unallocatedAmount).toFixed(2)
                 if(response.records[i].paymentDate){
                   response.records[i].paymentDate=response.records[i].paymentDate.split(' ')[0]
                 }

src/views/statisticalReport/shippingList.vue

@@ -31,11 +31,11 @@
             <el-option v-for="item in taskNoList" :key="item.taskNoKey" :label="item.taskNoValue"
               :value="item.taskNoValue" />
           </el-select>
-          <el-select v-model="processNo" placeholder="请选择运输阶段编号" clearable filterable @change="processNochange"
+          <!-- <el-select v-model="processNo" placeholder="请选择运输阶段编号" clearable filterable @change="processNochange"
             maxlength="500" type="input" class="findValue">
             <el-option v-for="item in processNoList" :key="item.processNoKey" :label="item.processNoValue"
               :value="item.processNoValue" />
-          </el-select>
+          </el-select> -->
            <!-- <el-input v-model="startAddress" placeholder="可按照发货地进行查找" clearable maxlength="500" type="input"
           class="findValue" @keyup.enter.native="find()"></el-input>
         <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
@@ -920,8 +920,10 @@
                 taskNoValue: response[i].taskNo,
                 processNo: response[i].tranProcessInfoList,
               })
+              this.getList()
             }
           })
+
       },
       taskNochange(e) {
         this.taskNo = e