前端

src/api/V2/contract/index.js

@@ -33,6 +33,8 @@ export const API_POST_EDITINFO = '/contractManagementInfo/editInfo'
 export const API_GET_STAFF = '/staff/query/getStaffListByCompId'
 // 获取现货采购负责人
 export const API_GET_STAFF_FIND = '/staff/query/findRole'
+// 获取现货采购负责人
+export const API_GET_STAFF_ALL = '/staff/query/getStaffListByCompId'
 //运输任务-添加-根据仓库类型选库名
 export const API_GET_TRAN_TASK_WAREHOUSE = '/tranTaskInfo/selectWarehouseList'
 

src/model/contarct/index.js

@@ -49,7 +49,8 @@ import {
     API_EDIT_CONTRACT,
     API_DELETE_CONTRACT,
     API_PAYMENT,
-    API_GET_SETTLEMENTPRICE
+    API_GET_SETTLEMENTPRICE,
+    API_GET_STAFF_ALL
 } from '@/api/V2/contract'
 // 列表
 export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
@@ -84,6 +85,8 @@ export const editInfo = appRx.post(API_POST_EDITINFO, errorCatcher, errorHandle,
 export const getstaff = appRx.get(API_GET_STAFF, errorCatcher, errorHandle, filter)
 //获取现货采购负责人
 export const getstafffind = appRx.get(API_GET_STAFF_FIND, errorCatcher, errorHandle, filter)
+//获取所有人
+export const getstaffall = appRx.get(API_GET_STAFF_ALL, errorCatcher, errorHandle, filter)
 //运输任务-添加-根据仓库类型选库名
 export const getwarehousename = appRx.get(API_GET_TRAN_TASK_WAREHOUSE, errorCatcher, errorHandle, filter)
 

src/views/contractManagement/purchaseContractAdd.vue

@@ -89,8 +89,11 @@
         </ws-form-item>
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="sellerPhone">
           <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" /> -->
-          <el-autocomplete class="inline-input" v-model="deptBudgetList.jointPhone" :fetch-suggestions="querySearch4"
-            placeholder="请输入合营方电话" @select="handleSelect"></el-autocomplete>
+          <el-select filterable  v-model="deptBudgetList.jointVentureParties" placeholder="请选择合营方名称" class="typeselect" 
+            @change="jointSelect" filterable clearable>
+            <el-option v-for="(item,index) in customerinfo" :key="index"  :label="item.customerName"
+              :value="item.customerName" />
+          </el-select>
         </ws-form-item>
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营加价" span="1" prop="seller" class="readonly">
           <ws-input v-model="deptBudgetList.jointVentureMarkup" placeholder="请输入合营加价" maxlength="3"
@@ -433,6 +436,7 @@
     editxiala,
     delxiala,
     getstafffind,
+    getstaffall,
     getRelationContractNo,
     getcustomerinfo,
     examineList
@@ -590,8 +594,8 @@ import { isUndefined } from 'xe-utils/methods'
       this.deptBudgetList.contractProcessInfo.gradeKey = 1
       this.deptBudgetList.contractGoodsInfo.grade = '一等品'
       this.deptBudgetList.contractGoodsInfo.gradeKey = 1
-      getstafffind({
-          roles: 'd6a5c8a52da544309259f91f75de1ec6'
+      getstaffall({
+        compId:this.compId
         })
         .toPromise()
         .then((response) => {
@@ -1006,6 +1010,13 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
+        if (!this.deptBudgetList.jointPhone) {
+          this.$message({
+            message: '请输入合营方电话！',
+            type: 'warning',
+          })
+          return
+        }
         if(!this.deptBudgetList.jointVentureMarkup&&this.deptBudgetList.jointVentureMarkup!=0){
           this.$message({
             message: '请输入合营加价！',

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -68,6 +68,10 @@
                       :value="item.inOutTaskNo" />
                   </el-select>
                 </ws-form-item>
+                <ws-form-item  label="已完成量" span="1" prop="donecount">
+                  <ws-input v-model="deptBudgetList.donecount" placeholder="自动获取，不可编辑" maxlength="100" disabled
+                    size="small" />
+                </ws-form-item>
                 <ws-form-item v-if='serviceManagementType==3&&deptBudgetList.id' label="业务编号" span="1" prop="qualityNo">
                   <ws-input v-model="deptBudgetList.qualityNo" placeholder="自动获取，不可编辑" maxlength="100" disabled
                     size="small" />
@@ -117,7 +121,7 @@
                 </ws-form-item>
                 <ws-form-item v-if="serviceManagementType == 3 && qyJurisdiction&&statusTypetext == '初检'||serviceManagementType == 3 && statusTypetext != '初检'" label="车牌号" span="1" prop="carNo">
                   <ws-input :disabled="disabled2"
-                    v-if="options2.length == 0 && serviceManagementType == 1 || serviceManagementType == 3 && carNumberList.length == 0"
+                    v-if="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"
                     filterable clearable v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect"
@@ -125,12 +129,12 @@
                     <el-option v-for="(item, index) in options2" :key="index"
                       :label="item.carNo + '(' + item.tranCarNo + ')'" :value="index" />
                   </el-select>
-                  <el-select :disabled="disabled2"
+                  <!-- <el-select :disabled="disabled2"
                     v-if="!carstatus && options2.length > 0 && serviceManagementType != 3" filterable clearable
                      v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect"
                     @change="carChange($event, 0)">
                     <el-option v-for="item in options2" :key="item.constKey" :label="item.carNo" :value="item.carNo" />
-                  </el-select>
+                  </el-select> -->
                   <el-select :disabled="disabled2" v-if="carNumberList.length > 0 && serviceManagementType == 3"
                     filterable clearable :allow-create="true"  v-model="deptBudgetList.carNo"
                     placeholder="请选择车牌号" class="typeselect" @change="carChange($event, 1)">
@@ -291,12 +295,12 @@
                     @change="carChange($event, 0)">
                     <el-option v-for="item in options2" :key="item.constKey" :label="item.carNo" :value="item.carNo" />
                   </el-select>
-                  <el-select :disabled="disabled2" v-if="carNumberList.length > 0 && serviceManagementType == 3"
+                  <!-- <el-select :disabled="disabled2" v-if="carNumberList.length > 0 && serviceManagementType == 3"
                     filterable clearable v-model="deptBudgetList.carNo"
                     placeholder="请选择车牌号" class="typeselect" @change="carChange($event, 1)">
                     <el-option v-for="item in carNumberList" :key="item.constKey" :label="item.carNo"
-                      :value="item.carNo" />
-                  </el-select>
+                      :value="item.carNo" /> 
+                 </el-select> -->
                   <!-- <el-select @change='carchange' v-if="statusTypetext=='初检'&&editcar==false&&carstatus||statusTypetext=='确认'&&editcar==false&&carstatus" v-model="deptBudgetList.carNo" placeholder="请选择车牌号">
                     <el-option v-for="(item,index) in options2" :key="item.value" :label="item.carNo + '(' + item.tranCarNo + ')'" :value="index"  />
                   </el-select>
@@ -310,17 +314,17 @@
                       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 == '散船'||deptBudgetList.outType == '集装箱船'">
+                <ws-form-item label="车牌号" span="1" prop="shipName" v-if="deptBudgetList.outType == '散船'||deptBudgetList.outType == '集装箱船'||deptBudgetList.outType == '火运'">
                   <ws-input :disabled="statusTypetext != '初检'"
                     v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
                 </ws-form-item>
-                <ws-form-item label="车厢号-1" span="1" prop="wingNumber" v-if="deptBudgetList.outType == '火运'">
+                <!-- <ws-form-item label="车厢号-1" span="1" prop="wingNumber" v-if="deptBudgetList.outType == '火运'">
                   <ws-input v-model="deptBudgetList.wingNumber" placeholder="请输入车厢号" maxlength="20" size="small" />
                 </ws-form-item>
                 <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther" v-if="deptBudgetList.outType == '火运'">
                   <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
                           size="small" />
-                </ws-form-item>
+                </ws-form-item> -->
                 <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)">
@@ -332,22 +336,22 @@
                   <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 == '集装箱船'">
+                  v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船'||deptBudgetList.outType == '火运'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
                     size="small" />
                 </ws-form-item>
                 <ws-form-item label="封号-1" span="1" prop="titleNo"
-                  v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船'">
+                  v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船'||deptBudgetList.outType == '火运'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20"
                     size="small" />
                 </ws-form-item>
                 <ws-form-item label="箱号-2" span="1" prop="boxNoOther"
-                  v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船'">
+                  v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船'||deptBudgetList.outType == '火运'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20"
                     size="small" />
                 </ws-form-item>
                 <ws-form-item label="封号-2" span="1" prop="titleNoOther"
-                  v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船'">
+                  v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船'||deptBudgetList.outType == '火运'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
                     size="small" />
                 </ws-form-item>
@@ -3327,6 +3331,7 @@ export default {
       for (let i = 0; i < this.taskNolist.length; i++) {
         if (this.taskNolist[i].inOutTaskNo == e) {
           var data = this.taskNolist[i]
+          this.deptBudgetList.donecount=data.completedQuantity+'/'+data.weight
           if (this.taskNolist[i].inOutType == '移库入库') {
             this.deptBudgetList.contractNo = this.taskNolist[i].moveTaskNo
           }else if(this.taskNolist[i].inOutType == '收购入库'){

src/views/outboundManagement/weighingManagementNew.vue

@@ -157,7 +157,8 @@
                       <ws-form-item label="车牌号" span="1" prop="carNo" v-if="
                       weighingList.outType == '散船' ||
                       weighingList.outType == '汽运' ||
-                      weighingList.outType == '集装箱船'
+                      weighingList.outType == '集装箱船'||
+                      weighingList.outType == '火运'
                     ">
                         <el-input :maxlength="'7'" v-if="carjudge" v-model="weighingList.carNo" placeholder="请输入车牌号"
                            size="small" :disabled="recheck1"/>
@@ -170,36 +171,40 @@
                       </ws-form-item>
                       <ws-form-item label="箱号-1" span="1" prop="boxNo" v-if="
                       weighingList.outType == '汽运' ||
-                      weighingList.outType == '集装箱船'
+                      weighingList.outType == '集装箱船'||
+                      weighingList.outType == '火运'
                     ">
                         <ws-input v-model="weighingList.boxNo" placeholder="请输入箱号" maxlength="20" size="small" :disabled="recheck1"/>
                       </ws-form-item>
                       <ws-form-item label="封号-1" span="1" prop="titleNo" v-if="
                       weighingList.outType == '汽运' ||
-                      weighingList.outType == '集装箱船'
+                      weighingList.outType == '集装箱船'||
+                      weighingList.outType == '火运'
                     ">
                         <ws-input v-model="weighingList.titleNo" placeholder="请输入封号" maxlength="20" size="small" :disabled="recheck1"/>
                       </ws-form-item>
                       <ws-form-item label="箱号-2" span="1" prop="boxNoOther" v-if="
                       weighingList.outType == '汽运' ||
-                      weighingList.outType == '集装箱船'
+                      weighingList.outType == '集装箱船'||
+                      weighingList.outType == '火运'
                     ">
                         <ws-input v-model="weighingList.boxNoOther" placeholder="请输入箱号" maxlength="20" size="small" :disabled="recheck1"/>
                       </ws-form-item>
 
                       <ws-form-item label="封号-2" span="1" prop="titleNoOther" v-if="
                       weighingList.outType == '汽运' ||
-                      weighingList.outType == '集装箱船'
+                      weighingList.outType == '集装箱船'||
+                      weighingList.outType == '火运'
                     ">
                         <ws-input v-model="weighingList.titleNoOther" placeholder="请输入封号" maxlength="20" size="small" :disabled="recheck1"/>
                       </ws-form-item>
-                      <ws-form-item label="车厢号-1" span="1" prop="wingNumber" v-if="weighingList.outType == '火运'">
+                      <!-- <ws-form-item label="车厢号-1" span="1" prop="wingNumber" v-if="weighingList.outType == '火运'">
                         <ws-input v-model="weighingList.wingNumber" placeholder="请输入车厢号" maxlength="20" size="small" />
                       </ws-form-item>
                       <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther" v-if="weighingList.outType == '火运'">
                         <ws-input v-model="weighingList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
                           size="small" />
-                      </ws-form-item>
+                      </ws-form-item> -->
                       <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"
@@ -681,6 +686,9 @@
         }else if(e=='集装箱船'){
           this.carjudge=true
           this.weighingList.selfLoading = '0'
+        }else if(e=='火运'){
+          this.carjudge=true
+          this.weighingList.selfLoading = '0'
         }
       },
       typePrintCannelClick() {

src/views/statisticalReport/huoyunList.vue

@@ -32,7 +32,7 @@
             maxlength="500" class="findValue">
             <el-option v-for="item in options" :key="item.constKey" :label="item.contractNo" :value="item.contractNo" />
           </el-select>
-          <el-select v-model="taskNo" placeholder="请选择运输任务编号" @change="taskNochange" maxlength="500" class="findValue"
+          <!-- <el-select v-model="taskNo" placeholder="请选择运输任务编号" @change="taskNochange" maxlength="500" class="findValue"
             filterable clearable>
             <el-option v-for="item in taskNoList" :key="item.taskNoKey" :label="item.taskNoValue "
               :value="item.taskNoValue" />
@@ -41,7 +41,7 @@
             class="findValue" filterable clearable>
             <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="
@@ -70,19 +70,18 @@
         <span class="span_text">{{priceStatus}}</span>
       </div>
 
-      <el-table class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px" ref="warehouseList"
-        border @row-click="handleRowClick" @selection-change="handleSelectionChange">
+      <el-table class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px" ref="warehouseList" @row-click="handleRowClick" @selection-change="handleSelectionChange">
         <el-table-column :selectable="selectInit" type="selection" width="55"></el-table-column>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
         <el-table-column class="table_td" prop="contractNo" label="合同编号"></el-table-column>
         <el-table-column class="table_td" prop="taskNo" label="运输任务"></el-table-column>
-        <el-table-column class="table_td" prop="processNo" label="运输阶段"></el-table-column>
+        <!-- <el-table-column class="table_td" prop="processNo" label="运输阶段"></el-table-column> -->
         <!-- <el-table-column
           class="table_td"
           prop="n"
           label="类型"
         ></el-table-column> -->
-        <el-table-column class="boxNo" prop="boxNo" 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="卸车净重(吨)">
         </el-table-column>

src/views/statisticalReport/shippingList.vue

@@ -56,6 +56,8 @@
             <span style="display:inline-block;margin-right:10px;">航次：{{shipNo}}</span>  
             <div style="display:inline-block;margin-right:10px;"> 水单装船重量（吨）：<span v-if="shippedWeight>0">{{shippedWeight}}<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
             src="../../../public/img/fujian.png" @click="fujian1()" alt="" /></span><ws-button v-if="shippedWeight==0" type="primary" @click="handlefeedback()">反馈</ws-button></div>
+            <div style="display:inline-block;margin-right:10px;"> 水单卸船重量（吨）：<span v-if="unloadingWeight>0">{{unloadingWeight}}<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png" @click="fujian2()" alt="" /></span><ws-button v-if="unloadingWeight==0" type="primary" @click="handledownfeedback()">反馈</ws-button></div>
           </div>
         </el-col>
       </el-row>
@@ -229,7 +231,7 @@
           <el-input type='number' v-model="shippedWeight" autocomplete="off" placeholder="输入水单装船重量"></el-input>
         </el-form-item>
         <el-form-item label="水单截图" >
-          <ws-upload ref="upload" :comp-id="compId" :appendix-ids="enclosure" 
+          <ws-upload ref="upload" :comp-id="compId" :appendix-ids="unEnclosure" 
         @onChange="onChange"
 				accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" />
         </el-form-item>
@@ -240,11 +242,34 @@
         <el-button @click="taskconfirm">确定</el-button>
       </div>
     </WinseaContentModal>
+    <WinseaContentModal v-model="editshow1" title="卸船反馈"
+      @on-cancel="editshow = false">
+      <el-form :model="taskform">
+        <el-form-item label="重量（吨）" >
+          <el-input type='number' v-model="unloadingWeight" autocomplete="off" placeholder="输入水单卸船重量"></el-input>
+        </el-form-item>
+        <el-form-item label="水单截图" >
+          <ws-upload ref="upload" :comp-id="compId" :appendix-ids="enclosure" 
+        @onChange="onChange1"
+				accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" />
+        </el-form-item>
+      </el-form>
+        
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="editshow1 = false">取 消</el-button>
+        <el-button @click="taskconfirm">确定</el-button>
+      </div>
+    </WinseaContentModal>
     <WinseaContentModal v-model="accessoryTFs1" :title="$t('system.noticeCircular.information')"
       @on-cancel="accessoryTFs1 = false">
         <ws-upload ref="upload" :comp-id="compId" :appendix-ids="enclosure" :editable="false"
 				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
+    <WinseaContentModal v-model="accessoryTFs2" :title="$t('system.noticeCircular.information')"
+      @on-cancel="accessoryTFs2 = false">
+        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="unEnclosure" :editable="false"
+				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+    </WinseaContentModal>
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="accessoryTFs = false">
       <div v-for="(item, index) in paymentScreenshotList" :key="'fj'+index">
@@ -304,6 +329,10 @@
         needReapply: true,
         taskform:{},
         accessoryTFs1:false,
+        editshow1:false,
+        accessoryTFs2:false,
+        unEnclosure:'',
+        unloadingWeight:0,
         dialogFormVisible1: false,
         dialogFormVisible2: false,
         dialogFormVisible3: false,
@@ -487,9 +516,23 @@
             this.$refs.upload.clearFiles()
           })
       },
+      onChange1() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async response => {
+            this.unEnclosure = response
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
+      },
       handlefeedback(){
         this.editshow=true
       },
+      handledownfeedback(){
+        this.editshow1=true
+      },
       taskconfirm(){
         if(!this.shippedWeight){
           this.$message.warning('水单装船重量不能为空')
@@ -513,6 +556,29 @@
             })
         })
       },
+      taskconfirm1(){
+        if(!this.shippedWeight){
+          this.$message.warning('水单卸船重量不能为空')
+          return
+        }
+        if(!this.unEnclosure){
+          this.$message.warning('至少上传一个水单截图')
+          return
+        }
+        this.$confirm(`水单信息提交后不可修改，确认提交？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          edittrantask({id:this.currecttask.id,unloadingWeight:this.unloadingWeight,unEnclosure:this.unEnclosure,tranProcessInfoList:[]}).toPromise().then((response) => {
+              this.editshow=false
+              this.$message.success('提交成功')
+            })
+            .catch((response) => {
+              EventBus.$emit('error', response.message)
+            })
+        })
+      },
       find(){
       this.getList()
     },
@@ -531,6 +597,10 @@
         console.log(this.enclosure)
           this.accessoryTFs1 = true
       },
+      fujian2() {
+        console.log(this.enclosure)
+          this.accessoryTFs2 = true
+      },
       cur(status) {
         if (status == 0) {
           this.currect = true
@@ -1058,6 +1128,8 @@
               this.shipNo=response[0].shipNo
               this.shippedWeight=response[0].shippedWeight
               this.enclosure=response[0].enclosure
+              this.unloadingWeight=response[0].unloadingWeight
+              this.unEnclosure=response[0].unEnclosure
               this.currecttask=response[0]
               this.getList()
             }
@@ -1075,6 +1147,8 @@
             this.shipNo=this.taskNoList1[i].shipNo
             this.enclosure=this.taskNoList1[i].enclosure
             this.shippedWeight=this.taskNoList1[i].shippedWeight
+            this.unEnclosure=this.taskNoList1[i].unEnclosure
+            this.unloadingWeight=this.taskNoList1[i].unloadingWeight
             this.currecttask=this.taskNoList1[i]
         //     for (let j = 0; j < this.taskNoList.length; j++) {
         //       this.processNoList.push({

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -176,7 +176,7 @@
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
-          <ws-form-item label="车型" span="1" prop="carModel"  v-show="index==0">
+          <!-- <ws-form-item label="车型" span="1" prop="carModel"  v-show="index==0">
             <el-select
               v-model="item.carModel"
               placeholder="请选择车型"
@@ -189,15 +189,15 @@
                 :value="items.constValue"
               />
             </el-select>
-          </ws-form-item>
-          <ws-form-item :label="'车厢号'" span="1" prop="boxNo"> 
+          </ws-form-item> -->
+          <!-- <ws-form-item :label="'车厢号'" span="1" prop="boxNo"> 
             <ws-input
               v-model="item.boxNo"
               placeholder="请输入车厢号"
               maxlength="20"
               size="small"
             />
-          </ws-form-item>
+          </ws-form-item> -->
         </ws-info-table>
         <span
           v-if="
@@ -212,10 +212,10 @@
           >×</span
         >
       </div>
-      <el-button class="add bg-bottom" type="primary" size="small" @click="add">
+      <!-- <el-button class="add bg-bottom" type="primary" size="small" @click="add">
         <img width="22" height="22" src="../../../public/img/add.png" alt="" />
         <div class="spans">添加车厢</div>
-      </el-button>
+      </el-button> -->
     </ws-form>
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">

src/views/warehousenew/warehousingOrder.vue

@@ -389,7 +389,8 @@
       :title="'输入'+titletype"
       :visible.sync="dialogVisiblecontent"
       width="30%"
-      :before-close="handleClose5">
+      :before-close="handleClose5"
+      :close-on-click-modal="false">
       <div> 
         <el-input
         type="textarea"