Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/api/common/index.js

@@ -101,3 +101,4 @@ export const API_POST_DELETEFILES = `/appendix/api/deleteFiles`
 export const API_POST_OTHERUPLOADFILES = `/appendix/api/uploadFiles`
 //获取公司下拉列表
 export const API_GET_API_COMPLIST = `/commonUser/getComp`
+export const API_GET_ADMINID = `/commonUser/api/onOpen`

src/global.js

@@ -0,0 +1,71 @@
+import Vue from 'vue'
+import store from '@/vendors/vuex'
+// import router from './router'
+// 2.新创建一个vue实例
+const v = new Vue()
+export default {
+  ws: {},
+  websocket: '',
+  setWs: function(newWs) {
+    this.ws = newWs
+  },
+  whetherWebSocket: function() {
+    var that =this
+    debugger
+      if ('WebSocket' in window) {
+        if (process.env.NODE_ENV === 'production') {
+          that.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/?adminId=84f62127b7384dcdbaeaddfe460329fc' )
+        }
+        else {
+          that.websocket = new WebSocket('ws://localhost:3000/')
+        }
+        that.initWebSocket()
+      } else {
+        alert('当前浏览器不支持websocket')
+      }
+  },
+  initWebSocket: function() {
+    // 连接错误
+    this.websocket.onerror =evt => {
+      console.log('WebSocket连接发生错误   状态码：' + this.websocket.readyState)
+    }
+    // 连接成功
+    this.websocket.onopen = evt => {
+      console.log('WebSocket连接成功    状态码：' + this.websocket.readyState)
+    }
+    // 收到消息的回调
+    this.websocket.onmessage = event => {
+      // 根据服务器推送的消息做自己的业务处理
+      console.log('服务端返回：' + event.data)
+      var msg = event.data.split('$')
+      var that = this
+      // document.getElementsByClassName('app-container').reload()
+      v.$notify.warning({
+        title: '新消息提醒',
+        message: msg[0],
+        duration: 0,
+        onClick() {
+          this.$router.push({
+            path: msg[1] }) // 你要跳转的路由 还可以传参 当然也可以通过其他方式跳转
+        }
+      })
+      // console.log(router)
+      var currentPage = this.$router.history.current.path
+      console.log(currentPage, 'currentPage')
+      this.$router.push({ path: '/' })
+      console.log('执行成功1')
+      this.$router.push({ path: currentPage,
+        query: {
+          params: Date()
+        }})
+      console.log('执行成功')
+    }
+    // 连接关闭的回调
+    this.websocket.onclose = evt => {
+      console.log('WebSocket连接关闭    状态码：' + this.websocket.readyState)
+    }
+
+    // 监听窗口关闭事件，当窗口关闭时，主动去关闭websocket连接，防止连接还没断开就关闭窗口，server端会抛异常。
+    window.onbeforeunload = this.onbeforeunload
+  }
+}

src/layout/index/sidebar/sidebarItem.vue

@@ -111,7 +111,7 @@ export default {
       return generateTitle(item[this.labelKey], (item.meta || {}).title, this)
     },
     vaildAvtive(item) {
-      console.log(item)
+      // console.log(item)
       const groupFlag = (item['group'] || []).some((ele) =>
         this.$route.path.includes(ele)
       )

src/main.js

@@ -28,6 +28,8 @@ Vue.prototype.WAREHOUSE = Warehouse.houseName
 Vue.prototype.common = Warehouse
 import axios from "axios";
 Vue.prototype.$axios = axios;
+import global from './global.js'
+Vue.prototype.global = global
 // 初始化vue-amap
 // AMap.initAMapApiLoader({
 //   // 高德key

src/model/home/index.js

@@ -3,7 +3,8 @@ import { appRx } from '../defalutConfig/indexRx'
 import {
   API_GET_GETFILELIST,
   API_GET_GETCURRENTUSERINFO,
-  API_GET_GETSTAFFHOMESHOWLIST
+  API_GET_GETSTAFFHOMESHOWLIST,
+  API_GET_ADMINID
 } from '@/api/common'
 import { API_GET_NOTICE_QUERY_NOTICENUMBER } from '@/api/V2/notice'
 
@@ -26,3 +27,4 @@ export const getCurrentUserInfo = appRx.get(API_GET_GETCURRENTUSERINFO, errorCat
 
 export const getStaffHomeShowList = appRx.get(API_GET_GETSTAFFHOMESHOWLIST, errorCatcher, errorHandle, filter)
 export const gChartsData = appRx.get(API_GET_GETCHARTSDATA, errorCatcher, errorHandle, filter)
+export const getAdminId = appRx.post(API_GET_ADMINID, errorCatcher, errorHandle, filter)

src/store/getters.js

@@ -60,6 +60,7 @@ const getters = {
   // 船端是否弹出框
   scheduleState: state => state.user.scheduleState,
   isTrainDialog: state => state.user.isTrainDialog, // 新手训练营弹框显示
+  adminId: state => state.app.adminId, 
 
 }
 export default getters

src/store/modules/permission.js

@@ -67,7 +67,7 @@ const mutations = {
     // console.log(routerList)
     state.menu = leftMenu(routerList, {})
     state.routes = routerList
-    console.log(routerList)
+    // console.log(routerList)
   },
   SET_MENU: (state, menu) => {
     state.menu = menu

src/store/modules/user.js

@@ -4,6 +4,7 @@ import { getNoviceGuideData, findVesselSysVersion, getStaffHomeShowList } from '
 import { setToken, getCompanyId, clearStorage } from '../../utils/auth'
 import { resetRouter, asyncRoutes } from '../../router'
 import notification from '../../notification'
+import Cookies from 'js-cookie'
 import {
   setStore,
 } from '@/utils/store'
@@ -22,7 +23,8 @@ const state = {
   guideInfo: {},
   isTrainDialog: '',
   userInfo: '',
-  userSetting: ''
+  userSetting: '',
+  adminId: Cookies.get('adminId') || ''
 }
 
 const getters = {
@@ -74,6 +76,10 @@ const mutations = {
   SET_USERSETTING: (state, params) => {
     state.userSetting = params
   },
+  SET_ADMINID: (state, adminId) => {
+    state.adminId = adminId
+    Cookies.set('adminId', adminId)
+  }
 }
 
 const actions = {
@@ -281,7 +287,10 @@ const actions = {
   async changeVesslBank({ commit, dispatch, state }, showVal) {
     await updateShowInfo(showVal).toPromise()
     dispatch('toSetShow', { userId: localStorage.getItem('ws-pf_userId') })
-  }
+  },
+  setAdminId({ commit }, adminId) {
+    commit('SET_ADMINID', adminId)
+  },
 }
 
 export default {

src/views/contractManagement/salesContractAdd.vue

@@ -224,6 +224,11 @@
             <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
               value-format="yyyy-MM-dd" />
           </ws-form-item>
+          <!--结算重量方式-->
+          <ws-form-item label="结算重量方式" span="1" prop="settlementWeightMethod" class="readonly">
+          <el-radio v-model="deptBudgetList.settlementWeightMethod" label="1">按出库重量结算</el-radio>
+          <el-radio v-model="deptBudgetList.settlementWeightMethod" label="2">按收货重量结算</el-radio>
+        </ws-form-item>
           <ws-form-item label="最终实际成交量（吨）" span="1" prop="finalTradingVolume">
             <ws-input v-model="deptBudgetList.finalTradingVolume" placeholder="请输入最终实际成交量" maxlength="100"
               size="small" />
@@ -457,6 +462,7 @@
           addressUrl: '',
           sourceGoods: '',
           placeDelivery: '',
+          settlementWeightMethod: '1',
         },
         pickerBeginDateBefore: {
           disabledDate: (time) => {

src/views/contractManagement/salesContractEdit.vue

@@ -230,6 +230,13 @@
             <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
               value-format="yyyy-MM-dd" />
           </ws-form-item>
+          <!--结算重量方式-->
+          <ws-form-item label="结算重量方式" span="1" prop="settlementWeightMethod">
+            <div class="unchanged">
+              {{ deptBudgetList.settlementWeightMethod==1?'按出库重量结算':'按收货重量结算' }}
+            </div>
+            <span class="unchangeable">*</span>
+          </ws-form-item>
           <!-- 最终实际交易量（吨） -->
           <ws-form-item label="最终实际交易量（吨）" span="1" prop="totalContractPrice">
             <ws-input v-model="deptBudgetList.finalTradingVolume" maxlength="100" placeholder="请输入最终实际交易量"

src/views/contractManagement/salesContractExamine.vue

@@ -200,7 +200,12 @@
               {{ deptBudgetList.signingDate }}
             </div>
           </ws-form-item>
-
+          <!--结算重量方式-->
+          <ws-form-item label="结算重量方式" span="1" prop="settlementWeightMethod">
+            <div class="unchanged">
+              {{ deptBudgetList.settlementWeightMethod==1?'按出库重量结算':'按收货重量结算' }}
+            </div>
+          </ws-form-item>
           <ws-form-item label="最终实际交易量 (吨)" span="1" prop="finalTradingVolume">
             <div class="unchanged">
               {{ deptBudgetList.finalTradingVolume }}
@@ -208,7 +213,7 @@
           </ws-form-item>
         </ws-info-table>
 
-        <!--面试信息-->
+        <!--货物信息-->
         <div class="remark">
           <h3>货物信息</h3>
         </div>

src/views/home/index.vue

@@ -162,7 +162,8 @@
     noticeNumber,
     queryCircularManagementReceiveList,
     getStaffHomeShowList,
-    gChartsData
+    gChartsData,
+    getAdminId
   } from '@/model/home/index'
   import {
     getUserVesselList,
@@ -327,6 +328,19 @@
       },
 
     },
+    activated(){
+           if ('WebSocket' in window) {
+                  if (process.env.NODE_ENV === 'production') {
+                    this.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/?adminId=84f62127b7384dcdbaeaddfe460329fc' )
+                  }
+                  else {
+                    this.websocket = new WebSocket('ws://localhost:8080/websocket/?adminId=84f62127b7384dcdbaeaddfe460329fc' )
+                  }
+                  this.initWebSocket()
+                } else {
+                  alert('当前浏览器不支持websocket')
+                }
+    },
     async created() {
       //获取快捷路口列表
       this.getRouteList()
@@ -342,6 +356,22 @@
       }
     },
     async mounted() {
+      // getAdminId().toPromise().then(response => {
+                this.loading = false
+                // WebSocket
+                // this.$store.dispatch('setAdminId', response.data.data)
+                if ('WebSocket' in window) {
+                  if (process.env.NODE_ENV === 'production') {
+                    this.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/84f62127b7384dcdbaeaddfe460329fc' )
+                  }
+                  else {
+                    this.websocket = new WebSocket('ws://192.168.1.115:8090/websocket/1' )
+                  }
+                  this.initWebSocket()
+                } else {
+                  alert('当前浏览器不支持websocket')
+                }
+              // })
       let that = this
       this.getChartsData()
       // this.timer = setInterval(function(){
@@ -416,6 +446,53 @@
           this.number.news = news
         })
       },
+         initWebSocket () {
+           console.log(this.webSocket,this.WebSocket)
+      // 连接错误
+      this.websocket.onerror = this.setErrorMessage
+      // 连接成功
+      this.websocket.onopen = this.setOnopenMessage
+
+      // 收到消息的回调
+      this.websocket.onmessage = this.setOnmessageMessage
+
+      // 连接关闭的回调
+      this.websocket.onclose = this.setOncloseMessage
+
+      // 监听窗口关闭事件，当窗口关闭时，主动去关闭websocket连接，防止连接还没断开就关闭窗口，server端会抛异常。
+      window.onbeforeunload = this.onbeforeunload
+    },
+    setErrorMessage () {
+      console.log(11111111)
+      console.log('WebSocket连接发生错误   状态码：' + this.websocket.readyState)
+    },
+    setOnopenMessage () {
+      console.log(222222222)
+      console.log('WebSocket连接成功    状态码：' + this.websocket.readyState)
+    },
+    setOnmessageMessage (event) {
+      console.log(3333)
+      // 根据服务器推送的消息做自己的业务处理
+      console.log('服务端返回：' + event.data)
+      var msg = event.data.split('$')
+      var that = this
+      this.$notify.warning({
+        title: '新消息提醒',
+        message: msg[0],
+        duration: 0,
+        onClick() {
+          that.$router.push({
+            path: msg[1] }) // 你要跳转的路由 还可以传参 当然也可以通过其他方式跳转
+        }
+      })
+      var currentPage = that.$router.history.current.path
+      that.$router.push({ path: '/' })
+      that.$router.push({ path: currentPage })
+    },
+    setOncloseMessage () {
+      debugger
+      console.log('WebSocket连接关闭    状态码：' + this.websocket.readyState)
+    },
       //跳转
       contract(index){
          if(index == 0){

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -982,6 +982,7 @@ export default {
           }
         }
       this.contractNo = e
+      this.currentPage=1
       this.getList()
     },
 
@@ -1020,10 +1021,18 @@ export default {
           sums[index] = '--'
         }
       })
-      // sums[sums.length-3]=sums[sums.length-3].toFixed(2)
-      // sums[sums.length-4]=sums[sums.length-4].toFixed(2)
-			// sums[sums.length-5]=sums[sums.length-5].toFixed(2)
-      // sums[sums.length-6]=sums[sums.length-6].toFixed(2)
+      if(typeof sums[sums.length-3]=='number'){
+        sums[sums.length-3]=sums[sums.length-3].toFixed(2)
+      }
+      if(typeof sums[sums.length-4]=='number'){
+        sums[sums.length-4]=sums[sums.length-4].toFixed(2)
+      }
+      if(typeof sums[sums.length-5]=='number'){
+        sums[sums.length-5]=sums[sums.length-3].toFixed(2)
+      }
+      if(typeof sums[sums.length-7]=='number'){
+        sums[sums.length-7]=sums[sums.length-7].toFixed(2)
+      }
       return sums
     },
     getList() {

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -726,7 +726,7 @@ export default {
         })
       xialaNo({
         compId: this.compId,
-        flag: 8,
+        flag: 7,
       })
         .toPromise()
         .then((response) => {

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -746,6 +746,7 @@ export default {
         })
       xialaNo({
         compId: this.compId,
+        flag: 7,
       })
         .toPromise()
         .then((response) => {

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -502,6 +502,9 @@
 				this.$router.go(-1)
 			},
 			returnsales() {
+				this.dataList = {
+								taskTypeKey: 1
+							}
 				this.$router.push({
 					path: 'tranManagementWarehouseInOuttask'
 				})

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -72,11 +72,19 @@
                 <el-input type="text" class="row-item" v-model="deptBudgetList.deliveryDateEnd" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="合同编号" prop="contractNo">
+             <el-col :span="8">
+              <el-form-item v-if="deptBudgetList.taskType=='移库'" label="移库编号" span="1" prop="contractNo">
+                <el-input type="text" class="row-item" v-model="deptBudgetList.contractNo" disabled></el-input>
+              </el-form-item>
+              <el-form-item v-else label="合同编号" span="1" prop="contractNo">
                 <el-input type="text" class="row-item" v-model="deptBudgetList.contractNo" disabled></el-input>
               </el-form-item>
             </el-col>
+             <el-col :span="8">
+              <el-form-item label="关联合同" v-if="deptBudgetList.relatedContract" span="1" prop="inOutDate" class="relatedContract">
+                <el-input type="text" class="row-item" v-model="deptBudgetList.relatedContract" disabled></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
           <div class="small-title" style="font-size: 16px">联络员及航次</div>
           <el-row class="myTest">

src/views/tranManagement/tranManagementShippingLook.vue

@@ -56,7 +56,9 @@
               <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">{{ deptBudgetList.deliveryDateEnd }}
               </ws-form-item>
               <!--合同编号-->
-              <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
+              <ws-form-item v-if="deptBudgetList.taskType=='移库'" label="移库编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
+              <ws-form-item v-else label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
+              <ws-form-item v-if="deptBudgetList.relatedContract" label="关联合同" span="1" prop="relatedContract">{{ deptBudgetList.relatedContract }}</ws-form-item>
             </ws-info-table>
           </div>
 

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -84,9 +84,15 @@
           {{ deptBudgetList.deliveryDateEnd }}
         </ws-form-item>
         <!--合同编号-->
-        <ws-form-item label="合同编号" span="1" prop="contractNo">
+         <ws-form-item v-if="deptBudgetList.taskType=='移库'" label="移库编号" span="1" prop="contractNo">
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
+        <ws-form-item v-else label="合同编号" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.relatedContract" label="关联合同" span="1" prop="relatedContract">
+          {{ deptBudgetList.relatedContract }}
+        </ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
       <div class="myTest">

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -70,9 +70,15 @@
         <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
           {{ deptBudgetList.deliveryDateEnd }}
         </ws-form-item>
-        <ws-form-item label="合同编号" span="1" prop="contractNo">
+        <ws-form-item v-if="deptBudgetList.taskType=='移库'" label="移库编号" span="1" prop="contractNo">
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
+        <ws-form-item v-else label="合同编号" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.relatedContract" label="关联合同" span="1" prop="relatedContract">
+          {{ deptBudgetList.relatedContract }}
+        </ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
       <div class="myTest">

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -70,9 +70,17 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="合同编号" span="1" prop="contractNo">
+              <el-form-item v-if="deptBudgetList.taskType=='移库'" label="移库编号" span="1" prop="contractNo">
                 <el-input type="text" class="row-item" v-model="deptBudgetList.contractNo" disabled></el-input>
               </el-form-item>
+              <el-form-item v-else label="合同编号" span="1" prop="contractNo">
+                <el-input type="text" class="row-item" v-model="deptBudgetList.contractNo" disabled></el-input>
+              </el-form-item>
+            </el-col>
+             <el-col :span="8">
+              <el-form-item label="关联合同" v-if="deptBudgetList.relatedContract" span="1" prop="inOutDate" class="relatedContract">
+                <el-input type="text" class="row-item" v-model="deptBudgetList.relatedContract" disabled></el-input>
+              </el-form-item>
             </el-col>
           </el-row>
           <div class="small-title" style="font-size: 16px">派车</div>

src/views/tranManagement/tranManagementVehicleLook.vue

@@ -79,9 +79,15 @@
           deptBudgetList.deliveryDateEnd
         }}</ws-form-item>
         <!--合同编号-->
-        <ws-form-item label="合同编号" span="1" prop="contractNo">{{
+        <ws-form-item label="移库编号" v-if="deptBudgetList.taskType=='移库'" span="1" prop="contractNo">{{
           deptBudgetList.contractNo
         }}</ws-form-item>
+        <ws-form-item label="合同编号" v-else span="1" prop="contractNo">{{
+          deptBudgetList.contractNo
+        }}</ws-form-item>
+        <ws-form-item label="关联合同" v-if="deptBudgetList.relatedContract" span="1" prop="contractNo">{{
+          deptBudgetList.relatedContract
+        }}</ws-form-item>  
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">派车</div>
        <div class="myTest">

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -226,6 +226,7 @@ export default {
             goodsNameKey: row.goodsNameKey,
             grade: row.grade,
             outType:row.outType,
+            addressUrl:row.addressUrl,
             grossWeight: row.grossWeight,
             inOutDate: row.inOutDate,
             inOutFlag: row.inOutFlag,
@@ -268,6 +269,7 @@ export default {
             goodsNameKey: row.goodsNameKey,
             outType:row.outType,
             grade: row.grade,
+            addressUrl:row.addressUrl,
             grossWeight: row.grossWeight,
             inOutDate: row.inOutDate,
             inOutFlag: row.inOutFlag,

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -702,6 +702,12 @@ export default {
     this.dataList.netWeight = Number(this.$route.query.netWeight).toFixed(2)
     this.dataList.grade = this.$route.query.grade
     this.dataList.agent = this.$route.query.agent
+    if(this.$route.query.addressUrl.indexOf(',')!=-1){
+      this.dataList.addressUrl=this.$route.query.addressUrl.split(',')
+    }else{
+      this.dataList.addressUrl=this.$route.query.addressUrl
+    }
+    
     this.dataList.carNo = this.$route.query.carNo
     this.dataList.outType = this.$route.query.outType
     this.dataList.inOutDate = this.$route.query.inOutDate

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -829,6 +829,11 @@ export default {
     this.dataList.tare = this.$route.query.tare
     this.dataList.netWeight = this.$route.query.netWeight
     this.dataList.grade = this.$route.query.grade
+    if(this.$route.query.addressUrl.indexOf(',')!=-1){
+      this.dataList.addressUrl=this.$route.query.addressUrl.split(',')
+    }else{
+      this.dataList.addressUrl=this.$route.query.addressUrl
+    }
     this.dataList.agent = this.$route.query.agent
     this.dataList.carNo = this.$route.query.carNo
     this.dataList.outType = this.$route.query.outType

src/views/warehouse/warehouseManagementRecord.vue

@@ -268,7 +268,7 @@
 					</el-table-column>
 					<el-table-column prop="agent" label="经办人">
 					</el-table-column>
-					<el-table-column prop="backOffice" label="内勤"> </el-table-column>
+					<el-table-column prop="backOffice" label="操作人"> </el-table-column>
 					<el-table-column prop="addressUrl" label="附件">
 						<template slot-scope="scope">
 							<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
@@ -298,9 +298,11 @@
 		<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
 			@on-cancel="handleClose">
 			<p>查看附件</p>
-			<ws-upload ref="upload" table-name="maintain_work_order" oss-key="mainPlan" :comp-id="compId"
-				:appendix-ids="appendixIdsAdd" :vesselId="deptBudgetList.addressUrl" :size-limit="size"
-				@uploadSuccess="uploadSuccess" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+			<el-image 
+    style="width: 100px; height: 100px"
+    :src="appendixIdss" 
+    :preview-src-list="srcList">
+  </el-image>
 		</WinseaContentModal>
 	</div>
 
@@ -342,21 +344,17 @@
 			return {
 				//弹出框
 				dialogViewSpareMoney: false,
-				dialogApproveFormVisible: false,
 				binnumberList:[],
 				// 船舶类型
 				monetaryKey: null,
-				// 表格显示数据
-				tableDate: [],
-				appendixIdsAdd: '',
 				// 是否显示
 				showType: true,
 				// 年
 				year: '',
+				srcList:[],
 				deptBudgetTotal: 0,
 				currentPage: 1,
 				pageSize: 10,
-				radiostatus: 1,
 				capacity: '',
 				searchKeyWord: '',
 				contractType: 2,
@@ -366,15 +364,14 @@
 				binNumber: '',
 				status: 1,
 				value2:[],
+				appendixIdss:'',
 				// 提交类型
 				submitType: true,
 				selectpackingMethod: {},
 				size: 10,
 				warehouseType: '1',
-				deptBudgetList1: {},
 				compId: localStorage.getItem('ws-pf_compId'),
 				deptCircularPage: {},
-				packtypeList: {},
 				pcFlag: 1,
 				date: {
 					year: dayjs().format('YYYY'),
@@ -693,8 +690,8 @@
 			},
 			fujian(row) {
 				if (
-					row.receiveAttachmentPath === null ||
-					row.receiveAttachmentPath === ''
+					row.addressUrl === null ||
+					row.addressUrl === ''
 				) {
 					EventBus.$emit(
 						'warning',
@@ -703,7 +700,8 @@
 				} else {
 					this.accessoryTFs = true
 				}
-				this.appendixIdss = row.receiveAttachmentPath
+				this.appendixIdss = row.addressUrl
+				this.srcList=[row.addressUrl]
 			},
 			// 关闭 dialog时 处理文件url 初始化upload组件
 			handleCloe() {