前端合营方和合营方电话

src/api/V2/statisticalReport/index.js

@@ -104,4 +104,6 @@ export const API_GET_YUNSHUNUMBER = '/tranTaskInfo/selectTask'
 // 火运，船运实际价格
 export const API_POST_YUNSHUSETPRICE = '/tranProcessInfo/api/setUpTranPrice'
 //汽运请款
-export const API_POST_SUBMITLOGISTICS = '/tranSettlementReport/api/submitLogistics'
+export const API_POST_SUBMITLOGISTICS = '/tranSettlementReport/api/submitLogistics'
+//船运反馈接口
+export const API_POST_EDITTRANTASK = '/tranTaskInfo/api/editTranTask'

src/model/statisticalReport/index.js

@@ -49,7 +49,8 @@ import {
     API_POST_YUNSHUSETPRICE,
     API_POST_EDIT_SETTLEMENTWEIGHT,
     API_POST_INVOICELIST,
-    API_POST_SUBMITLOGISTICS
+    API_POST_SUBMITLOGISTICS,
+    API_POST_EDITTRANTASK
 } from '@/api/V2/statisticalReport'
 //期货采购入库报表
 export const getpurchreceipt = appRx.get(API_GET_PURCHRECEIPT, errorCatcher, errorHandle, filter)
@@ -159,4 +160,6 @@ export const getYunShuNumber= appRx.get(API_GET_YUNSHUNUMBER, errorCatcher, erro
 // 火运，船运实际价格
 export const SetYunShuPrice = appRx.post(API_POST_YUNSHUSETPRICE, errorCatcher, errorHandle, filter)
 // 汽运请款
-export const submitlogistics = appRx.post(API_POST_SUBMITLOGISTICS, errorCatcher, errorHandle, filter)
+export const submitlogistics = appRx.post(API_POST_SUBMITLOGISTICS, errorCatcher, errorHandle, filter)
+// 船运反馈
+export const edittrantask = appRx.post(API_POST_EDITTRANTASK, errorCatcher, errorHandle, filter)

src/views/contractManagement/acquisitionContract.vue

@@ -65,7 +65,8 @@
       </el-table-column>
       <!-- <el-table-column prop="packingMethod" label="包装方式"> </el-table-column> -->
       <el-table-column prop="buyer" label="收购方"> </el-table-column>
-      <el-table-column prop="seller" label="合营方"> </el-table-column>
+      <el-table-column prop="seller" label="卖方"> </el-table-column>
+      <el-table-column prop="jointVentureParties" label="合营方"> </el-table-column>
       <el-table-column width='120' prop="completedQuantity" label="已完成（吨）">
         <template slot-scope="scope">
           <span style="color: #5473e8; font-weight: 600">{{

src/views/contractManagement/acquisitionContractAdd.vue

@@ -51,6 +51,9 @@
               :value="item.customerName" />
           </el-select>
         </ws-form-item>
+        <ws-form-item label="卖方" span="1" prop="seller">
+          <ws-input v-model="deptBudgetList.seller" placeholder="请输入卖方名称" maxlength="100" size="small" />
+        </ws-form-item>
         <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
           <el-radio v-model="deptBudgetList.deliverType" label="2">对方送货</el-radio>
           <el-radio v-model="deptBudgetList.deliverType" label="1">我方自提</el-radio>
@@ -61,15 +64,13 @@
               对方送货</el-radio>
             <el-radio v-model="deptBudgetList.deliverType" v-else label="2">对方送货</el-radio> -->
         </ws-form-item>
-         <!--卖方-->
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方" span="1" prop="seller" class="readonly">
           <!-- <ws-input v-model="deptBudgetList.seller" placeholder="请输入卖方名称" maxlength="100" size="small" /> -->
           <!-- <el-autocomplete class="inline-input" v-model="deptBudgetList.seller" :fetch-suggestions="querySearch2"
              @select="handleSelect"></el-autocomplete>
              -->
-            <el-select filterable  v-model="deptBudgetList.seller" placeholder="请选择合营方名称" class="typeselect" 
-            @change="sellerSelect" filterable clearable>
-
+            <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>
@@ -87,6 +88,9 @@
           <!-- <ws-input v-model.number="deptBudgetList.buyerPhone" placeholder="请输入买方电话" maxlength="100" size="small" /> -->
           <el-autocomplete class="inline-input" v-model="deptBudgetList.buyerPhone" :fetch-suggestions="querySearch3"
             placeholder="请输入收购方电话" @select="handleSelect"></el-autocomplete>
+        </ws-form-item>
+        <ws-form-item  label="卖方电话" span="1" prop="sellerPhone">
+          <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" />
         </ws-form-item>
          <!--交货日期（止）-->
         <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
@@ -95,7 +99,7 @@
         </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.sellerPhone" :fetch-suggestions="querySearch4"
+          <el-autocomplete class="inline-input" v-model="deptBudgetList.jointPhone" :fetch-suggestions="querySearch4"
             placeholder="请输入合营方电话" @select="handleSelect"></el-autocomplete>
         </ws-form-item>
          <!--价格类型-->
@@ -369,6 +373,7 @@ import { isUndefined } from 'xe-utils/methods'
           placeDelivery:'',
           addressUrl: '',
           sellerPhone:'',
+          seller:'无',
           buyer:localStorage.getItem('ws-pf_compName'),
           buyerPhone:'',
           personPhone:'',
@@ -467,12 +472,12 @@ import { isUndefined } from 'xe-utils/methods'
       handleSelect(item) {
         console.log(item);
       },
-      sellerSelect(item) {
+      jointSelect(item) {
         console.log(item)
         for (let i = 0; i < this.customerinfo.length; i++) {
           console.log(this.customerinfo[i].customerName,item)
           if(this.customerinfo[i].customerName==item){
-            this.deptBudgetList.sellerPhone=this.customerinfo[i].customerPhone
+            this.deptBudgetList.jointPhone=this.customerinfo[i].customerPhone
           }
         }
       },
@@ -751,14 +756,14 @@ import { isUndefined } from 'xe-utils/methods'
           return
         }
        if(this.deptBudgetList.transactionSubject == '合营'){
-        if (!this.deptBudgetList.seller) {
+        if (!this.deptBudgetList.jointVentureParties) {
           this.$message({
             message: '请输入合营方名称！',
             type: 'warning',
           })
           return
         }
-        if (this.deptBudgetList.seller.length > 30) {
+        if (this.deptBudgetList.jointVentureParties.length > 30) {
           this.$message({
             message: '合营方名称长度不符合要求,请输入30个字符之内！',
             type: 'warning',
@@ -782,7 +787,7 @@ import { isUndefined } from 'xe-utils/methods'
           return
         }
         if(this.deptBudgetList.transactionSubject == '合营'){
-        if (!this.deptBudgetList.sellerPhone) {
+        if (!this.deptBudgetList.jointPhone) {
           this.$message({
             message: '请输入合营方电话！',
             type: 'warning',

src/views/contractManagement/acquisitionContractEdit.vue

@@ -30,11 +30,14 @@
         <ws-form-item class="readonly" label="收购方" span="1" prop="buyer">
           {{ deptBudgetList.buyer }}
         </ws-form-item>
+        <ws-form-item class="readonly" label="卖方" span="1" prop="buyer">
+          {{ deptBudgetList.seller }}
+        </ws-form-item>
         <!-- 交货方式 -->
         <ws-form-item class="readonly" label="交货方式" span="1" prop="sourceGoods">
           {{ deptBudgetList.deliverType1 }}
         </ws-form-item>
-        <ws-form-item  v-if="deptBudgetList.transactionSubject == '合营'" class="readonly" label="合营方" span="1" prop="seller">{{ deptBudgetList.seller }}
+        <ws-form-item  v-if="deptBudgetList.transactionSubject == '合营'" class="readonly" label="合营方" span="1" prop="seller">{{ deptBudgetList.jointVentureParties }}
         </ws-form-item>
         <!-- 交货日期（起） -->
         <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
@@ -44,13 +47,16 @@
         <ws-form-item label="收购方电话" span="1" prop="buyerPhone">
           <ws-input v-model="deptBudgetList.buyerPhone" maxlength="100" size="small" />
         </ws-form-item>
+        <ws-form-item class="readonly" label="卖方电话" span="1" prop="buyer">
+          <ws-input v-model="deptBudgetList.sellerPhone" maxlength="100" size="small" />
+        </ws-form-item>
         <!-- 交货日期（止） -->
         <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
           <ws-date-picker v-model="deptBudgetList.deliveryDateEnd" type="date" placeholder="请选择交货日期（止）"
             value-format="yyyy-MM-dd" />
         </ws-form-item>
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="sellerPhone">
-          <ws-input v-model="deptBudgetList.sellerPhone" maxlength="100" size="small" placeholder="请输入合营方电话" />
+          <ws-input v-model="deptBudgetList.jointPhone" maxlength="100" size="small" placeholder="请输入合营方电话" />
         </ws-form-item>
         <!--价格类型-->
           <ws-form-item label="价格类型" span="1" prop="priceType">          

src/views/contractManagement/acquisitionContractExamine.vue

@@ -55,21 +55,25 @@
         <ws-form-item label="收购方" span="1" prop="buyer">
           {{ deptBudgetList.buyer }}
         </ws-form-item>
-        
+        <ws-form-item label="卖方" span="1" prop="buyer">
+          {{ deptBudgetList.sellerer }}
+        </ws-form-item>
         <ws-form-item label="交货方式" span="1" prop="deliverType1">{{ deptBudgetList.deliverType1 }}
         </ws-form-item>
-        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方" span="1" prop="seller">{{ deptBudgetList.seller }}
+        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方" span="1" prop="seller">{{ deptBudgetList.jointVentureParties }}
         </ws-form-item>
         <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
           {{ deptBudgetList.deliveryDateStart }}
         </ws-form-item>
         <ws-form-item label="收购方电话" span="1" prop="buyerPhone">{{ deptBudgetList.buyerPhone }}
         </ws-form-item>
+        <ws-form-item label="卖方电话" span="1" prop="buyerPhone">{{ deptBudgetList.sellerPhone }}
+        </ws-form-item>
         <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
           {{ deptBudgetList.deliveryDateEnd }}
         </ws-form-item>
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="sellerPhone">
-          {{ deptBudgetList.sellerPhone }}
+          {{ deptBudgetList.jointPhone }}
         </ws-form-item>
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营加价" span="1" prop="seller" class="readonly">
           {{ deptBudgetList.jointVentureMarkup }}

src/views/contractManagement/purchaseContractAdd.vue

@@ -80,6 +80,18 @@
           <el-radio v-model="deptBudgetList.transactionSubject" label="自营">自营</el-radio>
           <el-radio v-model="deptBudgetList.transactionSubject" label="合营">合营</el-radio>
         </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方" span="1" prop="seller" class="readonly">
+            <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="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>
+        </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"
             size="small" />
@@ -600,6 +612,15 @@ import { isUndefined } from 'xe-utils/methods'
       if (!this.restaurants4) this.restaurants4 = [];
     },
     methods: {
+      jointSelect(item) {
+        console.log(item)
+        for (let i = 0; i < this.customerinfo.length; i++) {
+          console.log(this.customerinfo[i].customerName,item)
+          if(this.customerinfo[i].customerName==item){
+            this.deptBudgetList.jointPhone=this.customerinfo[i].customerPhone
+          }
+        }
+      },
       copySelect(e){
         for (let i = 0; i < this.outContractNo.length; i++) {
           if(this.outContractNo[i].contractNo==e){
@@ -971,6 +992,20 @@ import { isUndefined } from 'xe-utils/methods'
 
       submit() {
         if(this.deptBudgetList.transactionSubject == '合营'){
+          if (!this.deptBudgetList.jointVentureParties) {
+          this.$message({
+            message: '请输入合营方名称！',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.jointVentureParties.length > 30) {
+          this.$message({
+            message: '合营方名称长度不符合要求,请输入30个字符之内！',
+            type: 'warning',
+          })
+          return
+        }
         if(!this.deptBudgetList.jointVentureMarkup&&this.deptBudgetList.jointVentureMarkup!=0){
           this.$message({
             message: '请输入合营加价！',
@@ -985,6 +1020,8 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
+
+        
        }
         // if(this.deptBudgetList.placeDelivery.indexOf('省')>-1){
         //       this.$message({

src/views/contractManagement/purchaseContractEdit.vue

@@ -30,6 +30,11 @@
         <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
           {{deptBudgetList.transactionSubject}}
         </ws-form-item>
+        <ws-form-item  v-if="deptBudgetList.transactionSubject == '合营'" class="readonly" label="合营方" span="1" prop="seller">{{ deptBudgetList.jointVentureParties }}
+        </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="sellerPhone">
+          <ws-input v-model="deptBudgetList.jointPhone" maxlength="100" size="small" placeholder="请输入合营方电话" />
+        </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"
             size="small" />
@@ -738,6 +743,27 @@
       },
       submit() {
         if(this.deptBudgetList.transactionSubject == '合营'){
+          if (!this.deptBudgetList.jointVentureParties) {
+          this.$message({
+            message: '请输入合营方名称！',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.jointVentureParties.length > 30) {
+          this.$message({
+            message: '合营方名称长度不符合要求,请输入30个字符之内！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.jointPhone) {
+          this.$message({
+            message: '请输入合营方电话！',
+            type: 'warning',
+          })
+          return
+        }
         if(!this.deptBudgetList.jointVentureMarkup&&this.deptBudgetList.jointVentureMarkup!=0){
           this.$message({
             message: '请输入合营加价！',

src/views/contractManagement/purchaseContractExamine.vue

@@ -55,6 +55,11 @@
         <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
           {{deptBudgetList.transactionSubject}}
         </ws-form-item>
+        <ws-form-item  v-if="deptBudgetList.transactionSubject == '合营'" class="readonly" label="合营方" span="1" prop="seller">{{ deptBudgetList.jointVentureParties }}
+        </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="jointPhone">
+          {{deptBudgetList.jointPhone}}
+        </ws-form-item>
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营加价" span="1" prop="seller" class="readonly">
           {{ deptBudgetList.jointVentureMarkup }}
         </ws-form-item>

src/views/contractManagement/salesContractAdd.vue

@@ -47,6 +47,18 @@
           <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
           <el-radio v-model="deptBudgetList.transactionSubject" label="自营">自营</el-radio>
           <el-radio v-model="deptBudgetList.transactionSubject" label="合营">合营</el-radio>
+        </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方" span="1" prop="seller" class="readonly">
+            <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="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>
         </ws-form-item>
           <!--关联合同-->
           <ws-form-item prop="agreementNo" label="关联合同" span="1" v-if="deptBudgetList.agreementType == '补充协议'">
@@ -558,6 +570,15 @@
       if (!this.restaurants4) this.restaurants4 = [];
     },
     methods: {
+      jointSelect(item) {
+        console.log(item)
+        for (let i = 0; i < this.customerinfo.length; i++) {
+          console.log(this.customerinfo[i].customerName,item)
+          if(this.customerinfo[i].customerName==item){
+            this.deptBudgetList.jointPhone=this.customerinfo[i].customerPhone
+          }
+        }
+      },
       copySelect(e){
         for (let i = 0; i < this.outContractNo.length; i++) {
           if(this.outContractNo[i].contractNo==e){
@@ -840,20 +861,43 @@
       },
 
       submit() {
-          if(this.deptBudgetList.placeDelivery.indexOf('省')>-1){
-              this.$message({
-            message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
+        if(this.deptBudgetList.transactionSubject == '合营'){
+          if (!this.deptBudgetList.jointVentureParties) {
+          this.$message({
+            message: '请输入合营方名称！',
             type: 'warning',
           })
           return
         }
-        if(this.deptBudgetList.sourceGoods.indexOf('省')>-1){
+        if (this.deptBudgetList.jointVentureParties.length > 30) {
           this.$message({
-          message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
-          type: 'warning',
+            message: '合营方名称长度不符合要求,请输入30个字符之内！',
+            type: 'warning',
           })
           return
         }
+        if (!this.deptBudgetList.jointPhone) {
+          this.$message({
+            message: '请输入合营方电话！',
+            type: 'warning',
+          })
+          return
+        }
+       }
+        //   if(this.deptBudgetList.placeDelivery.indexOf('省')>-1){
+        //       this.$message({
+        //     message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if(this.deptBudgetList.sourceGoods.indexOf('省')>-1){
+        //   this.$message({
+        //   message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
+        //   type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.contractNo) {
           this.$message({
             message: '合同编号不能为空',

src/views/contractManagement/salesContractEdit.vue

@@ -38,6 +38,11 @@
           </ws-form-item>
           <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
           {{deptBudgetList.transactionSubject}}
+        </ws-form-item>
+        <ws-form-item  v-if="deptBudgetList.transactionSubject == '合营'" class="readonly" label="合营方" span="1" prop="seller">{{ deptBudgetList.jointVentureParties }}
+        </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="sellerPhone">
+          <ws-input v-model="deptBudgetList.jointPhone" maxlength="100" size="small" placeholder="请输入合营方电话" />
         </ws-form-item>
           <!--关联合同-->
           <ws-form-item prop="agreementNo" label="关联合同" span="1" v-if="deptBudgetList.agreementType == '补充协议'">

src/views/contractManagement/salesContractExamine.vue

@@ -61,6 +61,13 @@
           <div class="unchanged">
               {{deptBudgetList.transactionSubject}}
             </div>
+        </ws-form-item>
+        <ws-form-item  v-if="deptBudgetList.transactionSubject == '合营'" class="readonly" label="合营方" span="1" prop="seller">
+          <div class="unchanged">{{ deptBudgetList.jointVentureParties }}</div>
+          
+        </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="jointPhone">
+          <div class="unchanged">{{deptBudgetList.jointPhone}}</div>
         </ws-form-item>
           <ws-form-item label="关联合同" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="agreementNo">
             <div class="unchanged">

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -266,7 +266,7 @@
                   </el-select>
                 </ws-form-item>
                 <ws-form-item
-                  v-if='serviceManagementType == 1 || serviceManagementType == 3 && deptBudgetList.outType == "自运"'
+                  v-if='serviceManagementType == 1&&deptBudgetList.outType == "汽运" || serviceManagementType == 3 && deptBudgetList.outType == "自运"'
                   label="车队" span="1" prop="fleetName">
                   <el-select @change="fleetNameChange" :disabled='recheck' v-model="deptBudgetList.fleet" placeholder="非车队车辆">
                     <el-option  key="0" label="非车队"
@@ -311,7 +311,7 @@
                     " 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-input 
+                  <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 == '火运'">

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>
+            <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>
@@ -224,7 +224,12 @@
         </el-form-item>
       </el-form>
         <ws-upload ref="upload" :comp-id="compId" :appendix-ids="enclosure" 
+        @onChange="onChange"
 				accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" />
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="editshow = false">取 消</el-button>
+        <el-button @click="taskconfirm">确定</el-button>
+      </div>
     </WinseaContentModal>
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="accessoryTFs = false">
@@ -363,7 +368,7 @@
         orderList: {},
         deptBudgetList: {},
         id: '',
-
+        currecttask:{},
         pcFlag: 1,
         carryoverlist: {},
         modification: [],
@@ -387,7 +392,8 @@
         },
         shipName:'',
         shipNo:'',
-        editshow:true,
+        enclosure:'',
+        editshow:false,
         amountNotPayable: 0,
         amountEdPayable: 0,
         paymentScreenshotUrls: [],
@@ -409,9 +415,28 @@
       this.showType = this.isShow
     },
     methods: {
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async response => {
+            this.enclosure = response
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
+      },
       handlefeedback(){
         this.editshow=true
       },
+      taskconfirm(){
+        edittrantask({id:this.currecttask.id,shippedWeight:this.shippedWeight,enclosure:this.enclosure,tranProcessInfoList:[]}).toPromise().then((response) => {
+              this.editshow=false
+            })
+            .catch((response) => {
+              EventBus.$emit('error', response.message)
+            })
+      },
       find(){
       this.getList()
     },
@@ -949,6 +974,7 @@
               this.taskNo=response[0].taskNo
               this.shipName=response[0].shipName
               this.shipNo=response[0].shipNo
+              this.currecttask=response[0]
               this.getList()
             }
           })