前端

src/views/outboundManagement/weighingManagementNew.vue

@@ -202,14 +202,14 @@
                       </ws-form-item>
                       <ws-form-item label="船名" span="1" prop="shipName" v-if="weighingList.outType == '散船'">
                         <!-- <ws-input v-model="weighingList.shipName" placeholder="请输入船名" maxlength="20" size="small" /> -->
-                        <el-select filterable clearable v-model="weighingList.shipName"
+                        <el-select :disabled="tpyeNo == 1" filterable clearable v-model="weighingList.shipName"
                           placeholder="请选择船名" class="typeselect" @change="shipInfoChange($event)">
                           <el-option v-for="item in shipInfoList" :key="item.id" :label="item.shipName"
                             :value="item.shipName" />
                         </el-select>
                       </ws-form-item>
                       <ws-form-item label="航次" span="1" prop="shipNumber" v-if="weighingList.outType == '散船'">
-                        <ws-input v-model="weighingList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
+                        <ws-inputc 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">
                         <ws-input type="number" @mousewheel.native.prevent v-if="tpyeNo == 2"
@@ -2612,7 +2612,6 @@
     margin: 20px 20px 0 20px;
     // border-radius: 10px;
     padding-bottom: 20px;
-
     .img1,
     .img2 {
       width: 200px;

src/views/warehousenew/warehousingOrder.vue

@@ -50,7 +50,7 @@
     </el-row>
     <div v-for="(item,index) in gainList" style='margin:10px;border:1px solid #ccc;padding:10px;'>
       <div style='width:100%;justify-content:space-between;align-items:center;margin-bottom:10px;' class="flex">
-        <div>{{item.issuingTime}}</div>
+        <div>{{item.issuingTime}} 合计{{item.summation}}</div>
         <div>{{item.warehouseName}}入库单<span v-if='item.warehouseType==2'>（临）</span></div>
         <div>
           <!-- <ws-button  type="primary" @click="distribution(item)" >预付款分配</ws-button>
@@ -778,7 +778,15 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             }
            }
           }
-          console.log(val)
+          item.summation=0
+          for (let i = 0; i < val.length; i++) {
+            if(val[i].surplusWeight){
+              item.summation+=val[i].surplusWeight
+            }
+            
+          }
+          this.$forceUpdate()
+          console.log(val,item.summation,1111111111)
           this.multipleSelection1[item.id]=val
         //  this.multipleSelection=this.noRepeat(this.multipleSelection.concat(val))
         //  console.log(this.multipleSelection)