修改el-upload上传地址，合同列表判断有没有权限上传附件

src/api/V2/profitable/index.js

@@ -75,4 +75,4 @@ export const API_EDIT_CONTRACT ='/contractManagementInfo/editInfo'
 // 结算校验
 export const API_JUDGE_SETTLEMENT ='/contractManagementInfo/judgeSettlementConditions'
 // 油费列表
-export const API_FUELFILLINGINFO     ='/fuelFillingInfo/selectFillingPc'
+export const API_FUELFILLINGINFO  ='/fuelFillingInfo/selectFillingPc'

src/global.js

@@ -1,10 +1,12 @@
 import Vue from 'vue'
+const uploadPath = process.env.VUE_APP_BASE_API + '/appendix/admin'
 import store from '@/vendors/vuex'
 // import router from './router'
 // 2.新创建一个vue实例
 const v = new Vue()
 export default {
   ws: {},
+  uploadPath,
   websocket: '',
   setWs: function(newWs) {
     this.ws = newWs

src/model/profitable/index.js

@@ -39,7 +39,7 @@ import {
   API_RELATIONCONTRACT,
   API_EDIT_CONTRACT,
   API_JUDGE_SETTLEMENT,
-  API_FUELFILLINGINFO
+  API_FUELFILLINGINFO,
 } from '@/api/V2/profitable'
 //收支明细列表
 export const getInOutDetailed = appRx.get(API_GET_INOUTDETAILED, errorCatcher, errorHandle, filter)

src/utils/util.js

@@ -5,6 +5,7 @@ import {
  * 动态插入css
  */
 
+
 export const loadStyle = (url, callback) => {
   if (!isInclude(url)) {
     const link = document.createElement('link');

src/views/contractManagement/acquisitionContract.vue

@@ -85,7 +85,7 @@
               style="color: #8890b1" />
           </el-select>
           <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
-            :disabled="scope.row.status=='已完成'"
+            :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'"
             @change='selectstatuschange($event,scope.row)'
 
             :value="scope.row.status">
@@ -200,7 +200,13 @@
 
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose">
+      <div v-if="applstatus">
       <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" 
+        v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`"
+        />
+      </div>
+      <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
   </div>
@@ -219,6 +225,7 @@
     downloadFile
   } from '@/utils/batchDown'
   import Pagination from '@/components/Pagination'
+  import { hasPermission } from '../../utils/getHasPermission'
   import WsUpload from '@/components/WsUpload'
   import {
     dayjs,
@@ -278,6 +285,7 @@
           month: dayjs().format('MM'),
         },
         contractList: [],
+        applstatus:false,
         deptBudgetList: {},
         historyList: [],
         appendixIdss: [],
@@ -350,6 +358,7 @@
       }
     },
     activated() {
+      this.applstatus=hasPermission('contractManagement.buyContract.buyContractInfo.appl')
       //cg.viewBudget
       //cg.viewSpareMoney
       // this.getVesselData();

src/views/contractManagement/collectionContractRecord.vue

@@ -169,7 +169,7 @@
             </ws-form-item>
             <ws-form-item label="上传截图"></ws-form-item>
             <div class="upLoad">
-              <el-upload class="avatar-uploader" action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
+              <el-upload class="avatar-uploader" :action="global.uploadPath" :show-file-list="false"
                 :on-success="handleAvatarSuccess">
 
                 <div v-if='imageUrl.length>0'>
@@ -202,7 +202,7 @@
             </ws-form-item>
             <ws-form-item label="上传截图" prop=" paymentScreenshot"></ws-form-item>
             <div class="upLoad">
-              <el-upload class="avatar-uploader" action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
+              <el-upload class="avatar-uploader" :action="global.uploadPath" :show-file-list="false"
                 :on-success="handleAvatarSuccess">
                 <!-- <img v-if="imageUrl" :src="imageUrl" class="avatar" />
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i> -->

src/views/contractManagement/purchaseContract.vue

@@ -85,7 +85,7 @@
               style="color: #8890b1" />
           </el-select>
           <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
-          :disabled="scope.row.status=='已完成'"
+          :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'"
             @change='selectstatuschange($event,scope.row)'
 
             :value="scope.row.status">
@@ -200,7 +200,13 @@
 
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose">
+        <div v-if="applstatus">
       <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" 
+        v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`"
+        />
+      </div>
+      <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
   </div>
@@ -345,11 +351,13 @@
             },
           ],
         },
+        applstatus:false,
         value1: '',
         value2: '',
       }
     },
     activated() {
+      this.applstatus=hasPermission('contractManagement.buyContract.buyContractInfo.appl')
       //cg.viewBudget
       //cg.viewSpareMoney
       // this.getVesselData();

src/views/contractManagement/purchaseContractCost.vue

@@ -165,7 +165,7 @@
         </el-form-item>
         
         <el-form-item label="附件">
-          <el-upload ref='uploadfiles' :file-list='dataList' action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+          <el-upload ref='uploadfiles' :file-list='dataList' :action="global.uploadPath" list-type="picture-card"
             :on-success="handlefujian" :on-remove="handleRemove" class="photo2">
             <i class="el-icon-plus"></i>
           </el-upload>

src/views/contractManagement/salesContract.vue

@@ -88,7 +88,7 @@
           </el-select>
           <el-select v-else v-model="scope.row.status" placeholder="" class="statusselect"
             @change='selectstatuschange($event,scope.row)'
-            :disabled="scope.row.status=='已完成'"
+            :disabled="scope.row.status=='已完成'||scope.row.status=='已结算'"
             :value="scope.row.status">
               <el-option label="执行中" value="执行中"
               style="color: #8890b1" />
@@ -202,7 +202,13 @@
     </el-pagination>
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose">
+        <div v-if="applstatus">
       <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" 
+        v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`"
+        />
+      </div>
+      <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
     <el-dialog
@@ -380,11 +386,13 @@
           ],
         },
         currentDate:0,
+        applstatus:false,
         value1: '',
         value2: '',
       }
     },
     activated() {
+      this.applstatus=hasPermission('contractManagement.buyContract.buyContractInfo.appl')
       //cg.viewBudget
       //cg.viewSpareMoney
       // this.getVesselData();

src/views/contractManagement/salesContractCost.vue

@@ -163,7 +163,7 @@
         </el-form-item>
         
         <el-form-item label="附件">
-          <el-upload ref='uploadfiles' :file-list='dataList' action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+          <el-upload ref='uploadfiles' :file-list='dataList' :action="global.uploadPath" list-type="picture-card"
             :on-success="handlefujian" :on-remove="handleRemove" class="photo2">
             <i class="el-icon-plus"></i>
           </el-upload>

src/views/contractManagement/storageContractRecord.vue

@@ -160,7 +160,7 @@
         </div>
         <div class="row">
           <div class="left">收款截图</div>
-          <el-upload class="avatar-uploader" action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
+          <el-upload class="avatar-uploader" :action="global.uploadPath" :show-file-list="false"
             :on-success="handleAvatarSuccess">
             <div v-if='imageUrl.length>0'>
               <div style='display:inline-block;' v-for='item in imageUrl'>

src/views/customerFundManagement/customerFundAdd.vue

@@ -108,7 +108,7 @@
               <div class="unload-img">上传银行卡正面</div>
               <el-upload
                 class="avatar-uploader avatar-uploader3"
-                action="https://www.zthymaoyi.com/upload/admin"
+                :action="global.uploadPath"
                 :show-file-list="false"
                 :on-success="bankSuccess1"
                 :disabled="disabled"
@@ -121,7 +121,7 @@
               <div class="unload-img">上传银行卡反面</div>
               <el-upload
                 class="avatar-uploader avatar-uploader4"
-                action="https://www.zthymaoyi.com/upload/admin"
+                :action="global.uploadPath"
                 :show-file-list="false"
                 :on-success="bankSuccess2"
                 :disabled="disabled"

src/views/customerFundManagement/customerFundEdit.vue

@@ -108,7 +108,7 @@
               <div class="unload-img">上传银行卡正面</div>
               <el-upload
                 class="avatar-uploader avatar-uploader3"
-                action="https://www.zthymaoyi.com/upload/admin"
+                ::action="global.uploadPath"
                 :show-file-list="false"
                 :on-success="bankSuccess1"
                 :disabled="disabled"
@@ -121,7 +121,7 @@
               <div class="unload-img">上传银行卡反面</div>
               <el-upload
                 class="avatar-uploader avatar-uploader4"
-                action="https://www.zthymaoyi.com/upload/admin"
+                :action="global.uploadPath"
                 :show-file-list="false"
                 :on-success="bankSuccess2"
                 :disabled="disabled"

src/views/customerFundManagement/customerFundList.vue

@@ -136,6 +136,7 @@
       }
     },
     activated() {
+      console.log(this.global.uploadPath)
       this.getList()
       this.showType = this.isShow
     },

src/views/financialManagement/collectionManagementList.vue

@@ -163,7 +163,7 @@
     <!-- 附件弹框 -->
     <el-dialog width="60%" :visible.sync="accessoryTFs" :before-close="handlefujianClose" :append-to-body="true">
       <p>添加附件</p>
-      <el-upload class="avatar-uploader" action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
+      <el-upload class="avatar-uploader" :action="global.uploadPath" :show-file-list="false"
         :on-success="handleAvatarSuccess">
         <i style='margin:0 auto;' class="el-icon-plus avatar-uploader-icon"></i>
       </el-upload>

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -25,7 +25,7 @@
               <div class="unload-img">上传身份证人像面</div>
               <el-upload
                 class="avatar-uploader avatar-uploader1"
-                action="https://www.zthymaoyi.com/upload/admin"
+                :action="global.uploadPath"
                 :show-file-list="false"
                 :on-success="upLoadSuccess1"
                 :disabled="disabled"
@@ -39,7 +39,7 @@
               <div class="unload-img">上传身份证国徽面</div>
               <el-upload
                 class="avatar-uploader avatar-uploader2"
-                action="https://www.zthymaoyi.com/upload/admin"
+                :action="global.uploadPath"
                 :show-file-list="false"
                 :on-success="upLoadSuccess2"
                 :disabled="disabled"
@@ -55,7 +55,7 @@
               <div class="unload-img">上传银行卡正面</div>
               <el-upload
                 class="avatar-uploader avatar-uploader3"
-                action="https://www.zthymaoyi.com/upload/admin"
+                :action="global.uploadPath"
                 :show-file-list="false"
                 :on-success="bankSuccess1"
                 :disabled="disabled"
@@ -68,7 +68,7 @@
               <div class="unload-img">上传银行卡反面</div>
               <el-upload
                 class="avatar-uploader avatar-uploader4"
-                action="https://www.zthymaoyi.com/upload/admin"
+                :action="global.uploadPath"
                 :show-file-list="false"
                 :on-success="bankSuccess2"
                 :disabled="disabled"

src/views/houseSelfCollect/inspectInfo.vue

@@ -372,7 +372,7 @@
             formdata.append('file', b);
             axios({
               method: 'post',
-              url: 'https://www.zthymaoyi.com/upload/admin',
+              url: 'global.uploadPath',
               data: formdata
             }).then((response) => {
               //编辑接口
@@ -405,7 +405,7 @@
             formdata.append('file', b);
             axios({
               method: 'post',
-              url: 'https://www.zthymaoyi.com/upload/admin',
+              url: 'global.uploadPath',
               data: formdata
             }).then((response) => {
               //编辑接口

src/views/houseSelfCollect/inspectInfoLook.vue

@@ -411,7 +411,7 @@
             formdata.append('file', b);
             axios({
               method: 'post',
-              url: 'https://www.zthymaoyi.com/upload/admin',
+              url:this.global.uploadPath,
               data: formdata
             }).then((response) => {
               //编辑接口
@@ -444,7 +444,7 @@
             formdata.append('file', b);
             axios({
               method: 'post',
-              url: 'https://www.zthymaoyi.com/upload/admin',
+              url:this.global.uploadPath,
               data: formdata
             }).then((response) => {
               //编辑接口

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -1019,7 +1019,7 @@ export default {
           formdata.append('file', b);
           axios({
             method: 'post',
-            url: 'https://www.zthymaoyi.com/upload/admin',
+            url:this.global.uploadPath,
             data: formdata
           }).then((response) => {
             //编辑接口
@@ -1051,7 +1051,7 @@ export default {
           formdata.append('file', b);
           axios({
             method: 'post',
-            url: 'https://www.zthymaoyi.com/upload/admin',
+            url:this.global.uploadPath,
             data: formdata
           }).then((response) => {
             //编辑接口

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -1284,7 +1284,7 @@
             formdata.append('file', b)
             axios({
               method: 'post',
-              url: 'https://www.zthymaoyi.com/upload/admin',
+              url:this.global.uploadPath,
               data: formdata,
             }).then((response) => {
               //编辑接口
@@ -1306,7 +1306,7 @@
             formdata.append('file', b)
             axios({
               method: 'post',
-              url: 'https://www.zthymaoyi.com/upload/admin',
+              url:this.global.uploadPath,
               data: formdata,
             }).then((response) => {
               //编辑接口

src/views/houseSelfCollect/paymentManagement.vue

@@ -200,7 +200,7 @@
             </ws-form-item>
             <ws-form-item label="上传截图" prop=" paymentScreenshot"></ws-form-item>
             <div class="upLoad">
-              <el-upload class="avatar-uploader" action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
+              <el-upload class="avatar-uploader" :action="global.uploadPath" :show-file-list="false"
                 :on-success="handleAvatarSuccess">
                 <img v-if="imageUrl" :src="imageUrl" class="avatar" />
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
@@ -219,7 +219,7 @@
       <!-- <div v-for="(item, index) in payImg" :key="index" class="pay_img">
         <img :src="item" alt class="img" />
       </div> -->
-      <el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+      <el-upload :action="global.uploadPath" list-type="picture-card"
         :on-success="handleAvatarSuccess1" :file-list='payImg' :limit='1'>
         <i slot="default" class="el-icon-plus"></i>
         <div slot="file" slot-scope="{file}">
@@ -235,7 +235,7 @@
           </span>
         </div>
       </el-upload>
-      <!-- <el-upload class="avatar-uploader"  action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
+      <!-- <el-upload class="avatar-uploader"  :action="global.uploadPath" :show-file-list="false"
                 :on-success="handleAvatarSuccess1" :on-remove="_handleRemove">
                 <img @mouseout='imgshow' @mouseover="deleteshow=true" v-if="payImg" :src="payImg" class="avatar" />
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>

src/views/houseSelfCollect/settlement.vue

@@ -338,7 +338,7 @@
             formdata.append('file', b)
             axios({
               method: 'post',
-              url: 'https://www.zthymaoyi.com/upload/admin',
+              url:this.global.uploadPath,
               data: formdata,
             }).then((response) => {
               //编辑接口
@@ -361,7 +361,7 @@
             formdata.append('file', b)
             axios({
               method: 'post',
-              url: 'https://www.zthymaoyi.com/upload/admin',
+              url:this.global.uploadPath,
               data: formdata,
             }).then((response) => {
               //编辑接口

src/views/houseSelfCollect/weightCheck.vue

@@ -944,7 +944,7 @@
             formdata.append('file', b)
             axios({
               method: 'post',
-              url: 'https://www.zthymaoyi.com/upload/admin',
+              url:this.global.uploadPath,
               data: formdata,
             }).then((response) => {
               //编辑接口
@@ -966,7 +966,7 @@
             formdata.append('file', b)
             axios({
               method: 'post',
-              url: 'https://www.zthymaoyi.com/upload/admin',
+              url:this.global.uploadPath,
               data: formdata,
             }).then((response) => {
               //编辑接口

src/views/outboundManagement/collectionManagement.vue

@@ -88,7 +88,7 @@
             class="deal" />
         </el-form-item>
         <el-form-item label="上传收款截图" :label-width="formLabelWidth">
-          <el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+          <el-upload :action="global.uploadPath" list-type="picture-card"
             :on-success="handlePictureCardPreview1" :on-remove="handleRemove" class="photo2">
             <i class="el-icon-plus"></i>
           </el-upload>

src/views/outboundManagement/newQualityInspectionManagement.vue

@@ -532,7 +532,7 @@
             formdata.append('file', b)
             axios({
               method: 'post',
-              url: 'https://www.zthymaoyi.com/upload/admin',
+              url:this.global.uploadPath,
               data: formdata,
             }).then((response) => {
               //编辑接口
@@ -555,7 +555,7 @@
             formdata.append('file', b)
             axios({
               method: 'post',
-              url: 'https://www.zthymaoyi.com/upload/admin',
+              url:this.global.uploadPath,
               data: formdata,
             }).then((response) => {
               //编辑接口

src/views/outboundManagement/weighingManagementNew.vue

@@ -839,7 +839,7 @@
             formdata.append('file', b)
             axios({
               method: 'post',
-              url: 'https://www.zthymaoyi.com/upload/admin',
+              url:this.global.uploadPath,
               data: formdata,
             }).then((response) => {
               //编辑接口
@@ -929,7 +929,7 @@
             formdata.append('file', b)
             axios({
               method: 'post',
-              url: 'https://www.zthymaoyi.com/upload/admin',
+              url:this.global.uploadPath,
               data: formdata,
             }).then((response) => {
               //编辑接口

src/views/outboundManagement/weighingManagementrecord.vue

@@ -865,7 +865,7 @@
       //     formdata.append('file', b)
       //     axios({
       //       method: 'post',
-      //       url: 'https://www.zthymaoyi.com/upload/admin',
+      //       url:this.global.uploadPath,
       //       data: formdata,
       //     }).then((response) => {
       //       //编辑接口
@@ -887,7 +887,7 @@
           formdata.append('file', b)
           axios({
             method: 'post',
-            url: 'https://www.zthymaoyi.com/upload/admin',
+            url:this.global.uploadPath,
             data: formdata,
           }).then((response) => {
             //编辑接口

src/views/platformaudit/grainpulseenterprisereview.vue

@@ -168,14 +168,14 @@
           <el-input v-model="companyList1.detailedAddress" placeholder="请输入详细地址"></el-input>
         </el-form-item>
         <el-form-item label="上传封面图片" :label-width="formLabelWidth" prop="attachmentAddress">
-          <el-upload class="avatar-uploader" action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
+          <el-upload class="avatar-uploader" :action="global.uploadPath" :show-file-list="false"
             :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
             <img v-if="companyList1.attachmentAddress" :src="companyList1.attachmentAddress" class="avatar">
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>
         <el-form-item label="营业执照" :label-width="formLabelWidth" prop="licenseAddress">
-          <el-upload class="avatar-uploader" action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
+          <el-upload class="avatar-uploader" :action="global.uploadPath" :show-file-list="false"
             :on-success="handleAvatarSuccess1" :before-upload="beforeAvatarUpload">
             <img v-if="companyList1.licenseAddress" :src="companyList1.licenseAddress" class="avatar">
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
@@ -201,7 +201,7 @@
           <div :key="index" v-for="(item, index) in companyList1.sitePhotoAddress">
             <img style="float:left" v-if="item" :src="item" class="avatar">
           </div>
-          <el-upload action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false" :limit="9"
+          <el-upload :action="global.uploadPath" :show-file-list="false" :limit="9"
             :on-success="handlePictureCardPreview" :on-remove="handleRemove">
             <i class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>

src/views/profitable/cashout.vue

@@ -66,7 +66,7 @@
             <ws-upload ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
         @onChange="onChange" 
        />
-          <!-- <el-upload ref='uploadfiles' :file-list='dataList' action="https://www.zthymaoyi.com/upload/admin" :on-preview="Previewf"
+          <!-- <el-upload ref='uploadfiles' :file-list='dataList' :action="global.uploadPath" :on-preview="Previewf"
             :on-success="handlefujian" :on-remove="handleRemove" class="photo2" >
             <i class="el-icon-plus"></i>
           </el-upload> -->
@@ -397,9 +397,7 @@
 
       },
       selectcontract(e){
-        console.log(e)
         for (let i = 0; i < this.contractList.length; i++) {
-          console.log(this.contractList[i])
           if(this.contractList[i].contractNo==e){
             this.deptBudgetList.contractId=this.contractList[i].id
             this.signingDate=this.contractList[i].signingDate
@@ -694,7 +692,7 @@
       getList() {
         getcontract({
         compId:localStorage.getItem('ws-pf_compId'),
-        flag:2
+        flag:11
         })
         .toPromise()
         .then((response) => {

src/views/profitable/cashoutaduit.vue

@@ -253,6 +253,7 @@ import WsUpload from '@/components/WsUpload'
       getList() {
        getcontract({
         compId:localStorage.getItem('ws-pf_compId'),
+        flag:11
         }).toPromise()
         .then((response) => {
           this.contractList=response

src/views/profitable/cashoutaduitNQ.vue

@@ -521,6 +521,7 @@
       getList() {
         getcontract({
           compId:localStorage.getItem('ws-pf_compId'),
+          flag:11
         })
         .toPromise()
         .then((response) => {

src/views/profitable/cashoutedit.vue

@@ -413,6 +413,7 @@
       getList() {
         getcontract({
         compId:localStorage.getItem('ws-pf_compId'),
+        flag:11
         })
         .toPromise()
         .then((response) => {

src/views/profitable/contractprofitsdetails.vue

@@ -229,37 +229,38 @@
           agreementType:row.agreementType,contractNo:row.contractNo,compId:this.compId})
             .toPromise()
             var arr=[row].concat(data)
-            console.log(arr)
             this.datalist.contractManagementInfoList=arr
-            var response=await judgesettlement(this.datalist).toPromise()
-        //           var weightprice=0
-        //           for (let i = 0; i < data.length; i++) {
-        //               weightprice+=(data[i].weight*data[i].settlementPrice)
-        //           }
-        //           if(row.agreementType=='收购合同'||row.agreementType=='采购合同'){
-        //             row.profit=weightprice-(row.weight*row.settlementPrice)
-        //           }else if(row.agreementType=='销售合同'){
-        //             row.profit=(row.weight*row.settlementPrice)-weightprice
-        //           }
-        // this.$confirm('结算后当前合同和相关合同不可再进行费用相关操作', '提示', {
-        //     confirmButtonText: '确定',
-        //     cancelButtonText: '取消',
-        //     type: 'warning'
-        //   })
-        //   .then(() => {
-        //     editcontract({flag:2,id:row.id,profit:row.profit}).toPromise()
-        //   .then(response => {
-        //     this.$message({
-        //         message: '结算成功!',
-        //         type: 'success',
-        //   })
-        //   }).catch(()=>{
-        //     this.$message({
-        //         message: '结算失败!',
-        //         type: 'warning',
-        //   })
-        //   })
-        //   })
+            judgesettlement(this.datalist).toPromise().then(response => {
+                         var weightprice=0
+                  for (let i = 0; i < data.length; i++) {
+                      weightprice+=(data[i].weight*data[i].settlementPrice)
+                  }
+                  if(row.agreementType=='收购合同'||row.agreementType=='采购合同'){
+                    row.profit=weightprice-(row.weight*row.settlementPrice)
+                  }else if(row.agreementType=='销售合同'){
+                    row.profit=(row.weight*row.settlementPrice)-weightprice
+                  }
+        this.$confirm('结算后当前合同和相关合同不可再进行费用相关操作', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            editcontract({flag:2,id:row.id,profit:row.profit}).toPromise()
+          .then(response => {
+            this.$message({
+                message: '结算成功!',
+                type: 'success',
+          })
+          this.getList()
+          }).catch(()=>{
+            this.$message({
+                message: '结算失败!',
+                type: 'warning',
+          })
+          })
+          })
+        })
       },
       finalstatement(row){
         this.tableData.contractNo=row.contractNo

src/views/profitable/expenseallotaduit.vue

@@ -273,6 +273,7 @@
       getList() {
        getcontract({
         compId:localStorage.getItem('ws-pf_compId'),
+        flag:11
         })
         .toPromise()
         .then((response) => {

src/views/profitable/expensemanagementdetails.vue

@@ -32,10 +32,10 @@
           <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">支出</el-button>
         </el-col>
         <el-col style='text-align:right;' :span="6">
-          <el-badge v-if="approveStatus" is-dot class="item">
+          <!-- <el-badge v-if="approveStatus" is-dot class="item">
             <el-button style="margin-left:10px" @click="oilcost()">油费</el-button>
           </el-badge>
-          <!-- <el-button v-else style="margin-left:10px" @click="oilcost()">油费</el-button>
+          <el-button v-else style="margin-left:10px" @click="oilcost()">油费</el-button>
           <el-button  style="margin-left:10px" @click="storageCharge()">仓储费</el-button> -->
           <el-button v-hasPermission="`lirunhesuan.feiyongguanli.add`" style="margin-left:10px" @click="cashout('')">请款</el-button>
           <el-button v-hasPermission="`lirunhesuan.feiyongguanli.shouk`" style="margin-right:10px" @click="receipt(1)" >收款</el-button>
@@ -304,10 +304,8 @@
         // getfielfillinginfo({
         //     // warehouseType: 1,
         //     compId: localStorage.getItem('ws-pf_compId'),
-        //     searchKeyWord:this.searchKeyWord,
-        //     currentPage: this.currentPage,
-        //     pageSize:this.pageSize ,
-        //     strokeType:this.strokeType
+        //     currentPage: 1,
+        //     pageSize:10 ,
         //     // searchType:this.searchType
         //   })
         //   .toPromise()

src/views/profitable/expensemanagentedit.vue

@@ -540,6 +540,7 @@ weight: 4000}]],
       getList() {
         getcontract({
         compId:localStorage.getItem('ws-pf_compId'),
+        flag:11
         })
         .toPromise()
         .then((response) => {

src/views/profitable/expensemanagentlook.vue

@@ -56,7 +56,7 @@
         </el-form-item>
         </el-form>
         <el-form v-if='roleName=="出纳"' label-position="left">
-               <div style='margin:0 0 10px;width:90%;'>账户信息</div>
+               <div v-if="payeeinfo" style='margin:0 0 10px;width:90%;'>账户信息</div>
             <el-form-item  label-width='100px' label="收款方" span="1" prop="purpose" class="readonly">
             {{payeeinfo.customerType=="企业客户"?payeeinfo.compName:payeeinfo.customerName}}
             </el-form-item>
@@ -170,13 +170,13 @@
         .toPromise()
         .then((response) => {
           this.deptBudgetList=response
-          this.srcList=[]
-          var arr=response.addressUrl.split(',')
-          for (let i = 0; i < arr.length; i++) {
-            if(arr[i]!=''){
-              this.srcList.push(arr[i])
-            }
-          }
+          // this.srcList=[]
+          // var arr=response.addressUrl.split(',')
+          // for (let i = 0; i < arr.length; i++) {
+          //   if(arr[i]!=''){
+          //     this.srcList.push(arr[i])
+          //   }
+          // }
           if(this.deptBudgetList.expensesPurpose==1){
               getpayeeinfo({compId:localStorage.getItem('ws-pf_compId'),contractNo:response.contractNo}).toPromise()
               .then((response1) => {

src/views/profitable/oilcost.vue

@@ -20,8 +20,7 @@
           <div style="flex-direction: row-reverse;" class="datascreen">
              <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px;"
                 src="../../../public/img/sousuo.png" alt="" /></el-button>
-            <el-input placeholder="可按费用名称、流向、经办人查找" class="input_css" v-model="searchKeyWord" clearable></el-input>
-           
+            <el-input placeholder="可按司机名、车牌号查找" class="input_css" v-model="searchKeyWord" clearable></el-input>
           </div>
         </el-col>
       </el-row>
@@ -46,31 +45,31 @@
           </el-table-column>
           <el-table-column prop="fillingNo" label="申请编号" width="100px">
           </el-table-column>
+          <el-table-column v-if="strokeType == 3" prop="warehouseName" label="仓库名" width="100px">
+          </el-table-column>
+          <el-table-column v-if="strokeType == 3" prop="warehouseName" label="备注" width="100px">
+          </el-table-column>
           <el-table-column v-if="strokeType == 1" prop="driverName" label="司机名" width="100px">
           </el-table-column>
           <el-table-column v-if="strokeType == 1" prop="carNo" label="车牌号" width="150px">
           </el-table-column>
-          <el-table-column prop="feeType" label="请款金额">
-            <template scope="scope">
-              <span v-if="strokeType==1">0{{ scope.row.totalCost }}</span>
-              <span v-else>{{ scope.row.amountRequested }}</span>
-            </template>
-          </el-table-column>
-          
-          <el-table-column prop="purpose" label="起点" width="200px">
+          <el-table-column v-if="strokeType == 1"  prop="purpose" label="总油耗（L）" width="200px">
             <template slot-scope="scope">
-              {{scope.row.originProvince}}{{scope.row.originCity}}{{scope.row.originArea}}{{scope.row.originAddress}}
+              {{scope.row.tfc}}
             </template>
           </el-table-column>
-          <el-table-column prop="amountMoney" label="终点">
+          <el-table-column v-if="strokeType == 1"  prop="purpose" label="总金额" width="200px">
             <template slot-scope="scope">
-              {{scope.row.destinationProvince}}{{scope.row.destinationCity}}{{scope.row.destinationArea}}{{scope.row.destinationAddress}}
+              {{scope.row.totalCost}}
             </template>
           </el-table-column>
-          <el-table-column prop="tfc" width="120" label="油耗（升）"></el-table-column>
+          <el-table-column v-if="strokeType == 1"  prop="createDate" width="120" label="申请时间"></el-table-column>
+          <el-table-column v-if="strokeType == 3"  prop="amountRequested" label="请款金额（元）">
+          </el-table-column>
+          <el-table-column v-if="strokeType == 3"  prop="createDate" width="120" label="请款时间"></el-table-column>
           <el-table-column prop="approveStatus" width="100" label="状态">
             <template slot-scope="scope">
-              {{scope.row.destinationProvince}}{{scope.row.destinationCity}}{{scope.row.destinationArea}}{{scope.row.destinationAddress}}
+              <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span><span v-else>{{scope.row.travelStatus}}</span>
             </template>
           </el-table-column>
           <el-table-column prop="expenseRemarks" label="附件">
@@ -106,7 +105,52 @@
         layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
       </el-pagination>
     </div>
-    <el-dialog width='50%' :visible.sync="dialogVisible1" :title="title1">
+    <el-dialog width='50%' :visible.sync="dialogVisible1" title="请款详情">
+      <!-- <div  style='padding:20px;'  :style="{'border-bottom':(index!=recordList.length-1?'1px solid #ccc':'none')}"
+> -->
+<el-form ref="form" label-width="120px">
+  <el-form-item v-if="strokeType==1" label="车牌号">
+    {{form.carNo}}
+  </el-form-item>
+  <el-form-item  label="起点">
+    {{form.originProvince}}{{form.originCity}}{{form.originArea}}{{form.originAddress}}
+  </el-form-item>
+  <el-form-item  label="终点">
+    {{form.destinationProvince}}{{form.destinationCity}}{{form.destinationArea}}{{form.destinationAddress}}
+  </el-form-item>
+  <el-form-item  v-if="strokeType==1" label="总油耗（升）">
+    {{form.tfc}}
+  </el-form-item>
+  <el-form-item  v-if="strokeType==1" label="总金额（元）">
+    {{form.totalCost}}
+  </el-form-item>
+  <div style="border-bottom:1px solid #ccc;margin-bottom:18px;"></div>
+  <div v-if="form.fillingDetailInfoList">
+    <div v-for="(item,index) in form.fillingDetailInfoList">
+      <div>加油-{{index+1}}</div>
+      <el-form-item label="油耗（升）">
+        {{item.oilConsumption}}
+      </el-form-item>
+      <el-form-item label="单价（元/升）">
+        {{item.currentOilPrice}}
+      </el-form-item>
+      <el-form-item label="油费（元）">
+        {{item.currentConsumption}}
+      </el-form-item>
+      <el-form-item label="凭证">
+        <img :src="item.addressUrl" alt="">
+      </el-form-item>
+    </div>
+  </div>
+  
+  <el-form-item>
+    <el-button type="primary" @click="onSubmit">立即创建</el-button>
+    <el-button>取消</el-button>
+  </el-form-item>
+</el-form>
+      <!-- </div> -->
+    </el-dialog>
+    <el-dialog width='50%' :visible.sync="dialogVisible2" :title="title1">
       <div  style='padding:20px;' v-for="(item,index) in recordList" :style="{'border-bottom':(index!=recordList.length-1?'1px solid #ccc':'none')}"
 >
         <div style='width:100%;justify-content: space-between;' class='flex'>
@@ -128,7 +172,7 @@
 <script>
   import WsUpload from '@/components/WsUpload'
   import {
-    getfielfillinginfo
+    getfielfillinginfo,
   } from '@/model/profitable/index'
   import {
     woekflowhandle
@@ -144,10 +188,11 @@
         deptBudgetTotal: 0,
         currentPage: 1,
         pageSize: 10,
-        size:9,
         recordList:[],
         compId:localStorage.getItem('ws-pf_compId'),
         dialogVisible1:false,
+        form:{},
+        dialogVisible2:false,
         deptCircularPage: {},
         searchType:"",
         searchKeyWord:"",
@@ -191,7 +236,8 @@
         }
       },
       look(row){
-        this.$router.push({name:'expensemanagentlook',query:{id:row.id,expensesType:row.expensesType}})
+        this.form=row
+        this.dialogVisible1=true
       },
       
       strokeTypeChange(num){

src/views/profitable/payment.vue

@@ -59,14 +59,13 @@
               :src="item"
                :preview-src-list="srcList"></el-image></span>
               -->
-              <el-upload ref='uploadfiles' :file-list='srcList' action="https://www.zthymaoyi.com/upload/admin" 
-              list-type="picture-card" :on-success="handlefujian" :on-remove="handleRemove" class="photo2" accept="image/jpg,image/jpeg,image/png">
-                <i class="el-icon-plus"></i>
-              </el-upload>
+              <ws-upload ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
+        @onChange="onChange" 
+       />
           </div>
         </el-form-item>
         </el-form>
-        <div style='width:50%;'>
+        <div v-if="this.payeeinfo" style='width:50%;'>
           <div style='margin:0 auto 10px;width:90%;'>账户信息</div>
             <el-form label-position="left">
             <el-form-item  label-width='100px' label="收款方" span="1" prop="purpose" class="readonly">
@@ -91,10 +90,13 @@
   </div>
 </template>
 <script>
+    import WsUpload from '@/components/WsUpload'
   import {lookexenseinfo,expensepayment,getpayeeinfo} from '@/model/profitable/index'
   import {woekflowhandle,} from '@/model/tasksport/index'
   export default {
-    components: {},
+    components: {
+      WsUpload,
+    },
     data() {
       return {
         value: [],
@@ -102,6 +104,8 @@
           name: "玉米",
           count: 2000,
         }],
+        size:9,
+        compId:localStorage.getItem('ws-pf_compId'),
         rejectshow:false,
         deptBudgetList:{},
         makeWordData: {},
@@ -132,13 +136,13 @@
           this.srcList=[]
           this.paymentScreenshot=[]
           this.deptBudgetList=response
-          var arr=response.addressUrl.split(',')
-          for (let i = 0; i < arr.length; i++) {
-            if(arr[i]!=''){
-              this.srcList.push({url:arr[i]})
-              this.paymentScreenshot.push(arr[i])
-            }
-          }
+          // var arr=response.addressUrl.split(',')
+          // for (let i = 0; i < arr.length; i++) {
+          //   if(arr[i]!=''){
+          //     this.srcList.push({url:arr[i]})
+          //     this.paymentScreenshot.push(arr[i])
+          //   }
+          // }
           if(localStorage.getItem('ws-pf_roleName')=='出纳'){
             if(this.deptBudgetList.expensesPurpose==1){
               getpayeeinfo({compId:localStorage.getItem('ws-pf_compId'),contractNo:response.contractNo}).toPromise()
@@ -151,26 +155,22 @@
         })
         
       },
-      handlefujian(file) {
-        // console.log(file)
-        this.paymentScreenshot.push(file.url)
-        // this.dialogVisible = true
-      },
-      handleRemove(file) {
-        // console.log(file)
-        for (let i = 0; i < this.paymentScreenshot.length; i++) {
-          if(this.paymentScreenshot[i]==response.url){
-            this.paymentScreenshot.splice(i, 1)
-          }
-          
-        }
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async response => {
+            this.deptBudgetList.addressUrl = response
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
       },
       returnsales(){
         this.$router.go(-1)
       },
       submit(){
         // console.log(this.paymentScreenshot)
-        this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
         this.$confirm('确定提交付款信息？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -286,7 +286,7 @@
   line-height:100px;
 }
 /deep/.el-upload-list--picture-card .el-upload-list__item{
-  width: 100px;
-  height:100px;
+  width: 110px;
+  height:140px;
 }
 </style>

src/views/profitable/receipt.vue

@@ -278,6 +278,7 @@
       getList() {
          getcontract({
         compId:localStorage.getItem('ws-pf_compId'),
+        flag:11
         })
         .toPromise()
         .then((response) => {

src/views/statisticalReport/autoSettlementList.vue

@@ -219,7 +219,7 @@
             class="deal" />
         </el-form-item>
         <el-form-item label="上传付款截图" :label-width="formLabelWidth">
-          <!-- <el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+          <!-- <el-upload :action="global.uploadPath" list-type="picture-card"
             :on-success="handlePictureCardPreview" :on-remove="handleRemove" class="photo2">
             <i class="el-icon-plus"></i>
           </el-upload> -->

src/views/statisticalReport/huoyunList.vue

@@ -110,7 +110,7 @@
             class="deal" />
         </el-form-item>
         <el-form-item label="上传付款截图" :label-width="formLabelWidth">
-          <el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+          <el-upload :action="global.uploadPath" list-type="picture-card"
             :on-success="handlePictureCardPreview" :on-remove="handleRemove" class="photo2">
             <i class="el-icon-plus"></i>
           </el-upload>

src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -75,7 +75,7 @@
             class="deal" />
         </el-form-item>
         <el-form-item label="上传付款截图" :label-width="formLabelWidth">
-          <el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+          <el-upload :action="global.uploadPath" list-type="picture-card"
             :on-success="handlePictureCardPreview" :on-remove="handleRemove" class="photo2">
             <i class="el-icon-plus"></i>
           </el-upload>
@@ -104,7 +104,7 @@
             class="deal" />
         </el-form-item>
         <el-form-item label="上传收款截图" :label-width="formLabelWidth">
-          <el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+          <el-upload :action="global.uploadPath" list-type="picture-card"
             :on-success="handlePictureCardPreview1" :on-remove="handleRemove" class="photo2">
             <i class="el-icon-plus"></i>
           </el-upload>

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -111,7 +111,7 @@
             class="deal" />
         </el-form-item>
         <el-form-item label="上传付款截图" :label-width="formLabelWidth">
-          <el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+          <el-upload :action="global.uploadPath" list-type="picture-card"
             :on-success="handlePictureCardPreview" :on-remove="handleRemove" class="photo2">
             <i class="el-icon-plus"></i>
           </el-upload>

src/views/statisticalReport/salesClosingCashierList.vue

@@ -111,7 +111,7 @@
             class="deal" />
         </el-form-item>
         <el-form-item label="上传付款截图" :label-width="formLabelWidth">
-          <el-upload v-if="paymentlist.paymentScreenshot == ''" action="https://www.zthymaoyi.com/upload/admin"
+          <el-upload v-if="paymentlist.paymentScreenshot == ''" :action="global.uploadPath"
             list-type="picture-card" :on-success="
               (res, file) => {
                 handlepaymentScreenshot(res, file)

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -102,7 +102,7 @@
             value-format="yyyy-MM-dd" class="deal" />
         </el-form-item>
         <el-form-item label="上传收款截图" :label-width="formLabelWidth">
-          <el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+          <el-upload :action="global.uploadPath" list-type="picture-card"
             :on-success="handlePictureCardPreview" :on-remove="handleRemove" class="photo2">
             <i class="el-icon-plus"></i>
           </el-upload>

src/views/statisticalReport/shippingList.vue

@@ -111,7 +111,7 @@
             class="deal" />
         </el-form-item>
         <el-form-item label="上传付款截图" :label-width="formLabelWidth">
-          <el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+          <el-upload :action="global.uploadPath" list-type="picture-card"
             :on-success="handlePictureCardPreview" :on-remove="handleRemove" class="photo2">
             <i class="el-icon-plus"></i>
           </el-upload>

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -165,7 +165,7 @@
             class="deal" />
         </el-form-item>
         <el-form-item label="上传付款截图" :label-width="formLabelWidth">
-          <el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+          <el-upload :action="global.uploadPath" list-type="picture-card"
             :on-success="handlePictureCardPreview" :on-remove="handleRemove" class="photo2">
             <i class="el-icon-plus"></i>
           </el-upload>
@@ -202,7 +202,7 @@
 
         </el-form-item>
         <el-form-item label="上传定金截图" :label-width="formLabelWidth">
-          <el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+          <el-upload :action="global.uploadPath" list-type="picture-card"
             :on-success="handlePictureCardPreviewDis" :on-remove="handleRemoveDis" class="photo2">
             <i class="el-icon-plus"></i>
           </el-upload>

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -356,7 +356,7 @@
             class="deal" />
         </el-form-item>
         <el-form-item label="上传收款截图" :label-width="formLabelWidth">
-          <el-upload ref='upload' action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+          <el-upload ref='upload' :action="global.uploadPath" list-type="picture-card"
             :on-success="handlePictureCardPreview" :on-remove="handleRemove" class="photo2">
             <i class="el-icon-plus"></i>
           </el-upload>
@@ -403,7 +403,7 @@
           <el-input v-model="deposit" autocomplete="off" placeholder="输入定金金额" class="deal"></el-input>
         </el-form-item>
         <el-form-item label="上传定金截图" :label-width="formLabelWidth">
-          <el-upload ref="upload" action="https://www.zthymaoyi.com/upload/admin" :limit='1' list-type="picture-card"
+          <el-upload ref="upload" :action="global.uploadPath" :limit='1' list-type="picture-card"
             :on-success="handlePictureCardPreview1" :on-remove="handleRemove" class="photo2">
             <i class="el-icon-plus"></i>
           </el-upload>

src/views/tradeServicesManagement/repayment.vue

@@ -68,13 +68,13 @@
             </ws-form-item>
             <ws-form-item label="上传还款截图" prop="paymentScreenshot"></ws-form-item>
             <div class="upLoad">
-              <!-- <el-upload class="avatar-uploader" action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
+              <!-- <el-upload class="avatar-uploader" :action="global.uploadPath" :show-file-list="false"
                 :on-success="handleAvatarSuccess">
                 <img v-if="imageUrl" :src="imageUrl" class="avatar" />
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload> -->
                <!-- <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             list-type="picture-card"
             :on-success="handleAvatarSuccess"
             :on-remove="handleRemove"

src/views/tranManagement/tranManagementDriverAdd.vue

@@ -265,7 +265,7 @@
                 size="small"
               />
               <el-upload
-                action="https://www.zthymaoyi.com/upload/admin"
+                :action="global.uploadPath"
                 :show-file-list="false"
                 :on-success="
                   (res, file) => {
@@ -349,7 +349,7 @@
                 size="small"
               />
               <el-upload
-                action="https://www.zthymaoyi.com/upload/admin"
+                :action="global.uploadPath"
                 :show-file-list="false"
                 :on-success="
                   (res, file) => {
@@ -409,7 +409,7 @@
       <div class="flex">
         <div>
           <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="uploadSuccessHandletravel"
             class="avatar-uploader"
@@ -428,7 +428,7 @@
         </div>
         <div>
           <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="uploadSuccessHandledrive"
             class="avatar-uploader"
@@ -447,7 +447,7 @@
         </div>
         <div>
           <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="uploadSuccessHandleway"
             class="avatar-uploader"
@@ -466,7 +466,7 @@
         </div>
         <div>
           <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="uploadSuccessHandlequalification"
             class="avatar-uploader"
@@ -485,7 +485,7 @@
         </div>
         <div>
           <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="uploadSuccessHandleidentityjust"
             class="avatar-uploader"
@@ -504,7 +504,7 @@
         </div>
         <div>
           <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="uploadSuccessHandleidentityagainst"
             class="avatar-uploader"

src/views/tranManagement/tranManagementDriverEdit.vue

@@ -268,7 +268,7 @@
                 size="small"
               />
               <el-upload
-                action="https://www.zthymaoyi.com/upload/admin"
+                :action="global.uploadPath"
                 :show-file-list="false"
                 :on-success="
                   (res, file) => {
@@ -353,7 +353,7 @@
                 size="small"
               />
               <el-upload
-                action="https://www.zthymaoyi.com/upload/admin"
+                :action="global.uploadPath"
                 :show-file-list="false"
                 :on-success="
                   (res, file) => {
@@ -414,7 +414,7 @@
         <!-- <div v-for="(item,index) in deptBudgetList.addressUrlArray"> -->
         <div>
           <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="uploadSuccessHandletravel"
             class="avatar-uploader"
@@ -434,7 +434,7 @@
         </div>
         <div>
           <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="uploadSuccessHandledrive"
             class="avatar-uploader"
@@ -454,7 +454,7 @@
         </div>
         <div>
           <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="uploadSuccessHandleway"
             class="avatar-uploader"
@@ -474,7 +474,7 @@
         </div>
         <div>
           <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="uploadSuccessHandlequalification"
             class="avatar-uploader"
@@ -494,7 +494,7 @@
         </div>
         <div>
           <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="uploadSuccessHandleidentityjust"
             class="avatar-uploader"
@@ -514,7 +514,7 @@
         </div>
         <div>
           <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="uploadSuccessHandleidentityagainst"
             class="avatar-uploader"

src/views/tranManagement/tranManagementFireFeedback.vue

@@ -109,7 +109,7 @@
             <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
                 <!-- slot-scope="scope" -->
-                <el-upload action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false" :on-success="
+                <el-upload :action="global.uploadPath" :show-file-list="false" :on-success="
                     (res) => {
                       uploadSuccessHandle1(res, index)
                     }

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -180,7 +180,7 @@
               <!-- slot-scope="scope" -->
               <template>
                 <el-upload
-                  action="https://www.zthymaoyi.com/upload/admin"
+                  :action="global.uploadPath"
                   :show-file-list="false"
                   :on-success="
                     (res) => {

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -109,7 +109,7 @@
           <div style="font-size: 16px; width: 100%; text-align: right;display:flex;justify-content:end;">
             <!-- <el-upload style="margin-left: 8px;"
           class=""
-          action="https://www.zthymaoyi.com/upload/admin"
+          :action="global.uploadPath"
           :show-file-list="false"
           :on-success="
           (res, file) => {
@@ -262,7 +262,7 @@
               <ws-form-item label="磅单：" span="1" prop="unloadPoundImg">
                 <template>
                   <el-upload
-                    action="https://www.zthymaoyi.com/upload/admin"
+                    :action="global.uploadPath"
                     :show-file-list="false"
                     :on-success="
                       (res) => {

src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -314,7 +314,7 @@
           <!-- slot-scope="scope" -->
           <template>
             <el-upload
-              action="https://www.zthymaoyi.com/upload/admin"
+              :action="global.uploadPath"
               :show-file-list="false"
               :on-success="
                 (res) => {

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -55,7 +55,7 @@
       <div style="font-size: 16px; width: 50%;float: left;text-align: right;display:flex;justify-content:end;">
         <!-- <el-upload style="margin-left: 8px;"
           class=""
-          action="https://www.zthymaoyi.com/upload/admin"
+          :action="global.uploadPath"
           :show-file-list="false"
           :on-success="
           (res, file) => {
@@ -142,7 +142,7 @@
             <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <!-- slot-scope="scope" -->
               <template>
-                <el-upload action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
+                <el-upload :action="global.uploadPath" :show-file-list="false"
                   :on-success=" (res) => { uploadSuccessHandle1(res,index)}" class="avatar-uploader"
                   accept=".jpg, .jpeg, .png, .gif">
                   <img width="18" height="20" style="

src/views/tranManagement/tranManagementUnShippingFeedback.vue

@@ -307,7 +307,7 @@
         <!-- slot-scope="scope" -->
         <template>
           <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="
               (res) => {

src/views/warehouse/warehouseManagementAdd.vue

@@ -81,7 +81,7 @@
     </ws-form>
     <ws-form ref="deptBudgetList" :model="deptBudgetList">
       <div class="small-title" v-show="radio == 1">上传仓库照片</div>
-      <el-upload ref='upload' action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false" :on-success="
+      <el-upload ref='upload' :action="global.uploadPath" :show-file-list="false" :on-success="
           (res, file) => {
             uploadSuccessHandle(res)
           }

src/views/warehouse/warehouseManagementDelivery.vue

@@ -474,7 +474,7 @@
       </div>
       <div class="small-title">上传磅单照片</div>
       <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="
               (res) => {

src/views/warehouse/warehouseManagementEdit.vue

@@ -86,7 +86,7 @@
       </ws-form>
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
         <div v-if="warehouseType == 1" class="small-title">上传仓库照片</div>
-        <el-upload action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false" :on-success="
+        <el-upload :action="global.uploadPath" :show-file-list="false" :on-success="
             (res, file) => {
               uploadSuccessHandle(res)
             }

src/views/warehouse/warehouseManagementGross.vue

@@ -345,7 +345,7 @@
       </div>
       <!-- <div class="small-title">上传磅单照片</div>
       <el-upload
-        action="https://www.zthymaoyi.com/upload/admin"
+        :action="global.uploadPath"
         :show-file-list="false"
         :on-success="
           (res) => {

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -303,7 +303,7 @@
       </div>
       <!-- <div class="small-title">上传磅单照片</div>
        <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="
               (res) => {

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -260,7 +260,7 @@
       </div>
       <!-- <div class="small-title">上传磅单照片</div>
       <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="
               (res) => {

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -442,7 +442,7 @@
       </div>
       <div class="small-title">上传磅单照片</div>
       <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="
               (res) => {

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -544,7 +544,7 @@
       </div>
       <div class="small-title">上传磅单照片</div>
        <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="
               (res) => {

src/views/warehouse/warehouseManagementPut.vue

@@ -338,7 +338,7 @@
         </div>
       </div>
       <div class="small-title">上传磅单照片</div>
-      <el-upload action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false" :on-success="
+      <el-upload :action="global.uploadPath" :show-file-list="false" :on-success="
           (res) => {
             uploadSuccessHandle1(res)
           }

src/views/warehouse/warehouseManagementTare.vue

@@ -244,7 +244,7 @@
       </div>
       <!-- <div class="small-title">上传磅单照片</div>
       <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="
               (res) => {

src/views/warehousenew/warehouseManagementAdd.vue

@@ -76,22 +76,24 @@
       </ws-info-table>
     </ws-form>
     <ws-form ref="deptBudgetList" :model="deptBudgetList">
-      <div class="small-title" v-show="radio == 1">上传仓库照片</div>
-      <el-upload ref='upload' action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false" :on-success="
+      <div class="small-title" v-show="radio == 1">上传附件</div>
+      <!-- <el-upload ref='upload' action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false" :on-success="
           (res, file) => {
             uploadSuccessHandle(res)
           }
         " class="avatar-uploader" accept=".jpg, .jpeg, .png, .gif">
         <el-button v-show="radio == 1">上传附件</el-button>
-      </el-upload>
-      <div class="addressUrls" v-if="addressUrls != null">
+      </el-upload> -->
+      <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
+        @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+      <!-- <div class="addressUrls" v-if="addressUrls != null">
         <div class="addressUrls-item">
           <div v-for="(item, index) in addressUrls" class="addressUrl" :key="index">
             <div @click="close(index)" class="iconfont icon-guanbi"></div>
             <img v-if="addressUrls != null" width="100" height="100" :src="item" alt="" />
           </div>
         </div>
-      </div>
+      </div> -->
       <div style="margin-bottom: 5px" class="small-title">仓库定位</div>
       <!-- <map-drag  @marker="marker" @selectedAddress="selectedAddress" @provinceChange='provinceChange' @pickedAddress='getInfo'></map-drag> -->
       <map-drag @marker="marker" ref="childMap" :isShowaddress='false' v-on:addressListen='getAddress' v-on:pickedAddress='searchAddress' ></map-drag>
@@ -313,15 +315,17 @@
         })
       },
       // 上传附件
-      uploadSuccessHandle(e) {
-        this.deptBudgetList.addressUrl += e.url + ','
-        this.addressUrls.push(e.url)
-      },
-      onChange(files) {
-        this.fileNum = files
-        this.$refs.upload.handleSaveBill().then((res) => {})
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async response => {
+            this.deptBudgetList.addressUrl = response
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
       },
-
       submit() {
         
         if (this.radio == 1) {

src/views/warehousenew/warehouseManagementDelivery.vue

@@ -472,7 +472,7 @@
       </div>
       <div class="small-title">上传磅单照片</div>
       <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="
               (res) => {

src/views/warehousenew/warehouseManagementEdit.vue

@@ -89,28 +89,9 @@
         </div>
       </ws-form>
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
-        <div v-if="warehouseType == 1" class="small-title">上传仓库照片</div>
-        <el-upload action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false" :on-success="
-            (res, file) => {
-              uploadSuccessHandle(res)
-            }
-          " :on-remove="
-            (value) => {
-              handleRemove(value)
-            }
-          " class="avatar-uploader" accept=".jpg, .jpeg, .png, .gif">
-          <el-button v-if="warehouseType == 1">上传附件</el-button>
-        </el-upload>
-        <div class="addressUrls" v-if="addressUrls != null">
-            <div v-for="(item , index) in addressUrls" class="addressUrl" :key="index">
-              <div @click='close(index)' class="iconfont icon-guanbi"></div>
-              <el-image  v-if="addressUrls != null"
-                style="width: 100px; height: 100px"
-                :src="item" 
-                :preview-src-list="addressUrls">
-              </el-image>
-          </div>
-        </div>
+        <div v-if="warehouseType == 1" class="small-title">上传附件</div>
+        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
+        @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
         <div class="small-title">仓库定位</div>
         <map-drag @marker="marker" :isShowaddress='false' v-on:addressListen='getAddress'
           v-on:pickedAddress='searchAddress'></map-drag>

src/views/warehousenew/warehouseManagementGross.vue

@@ -669,7 +669,7 @@
       </div>
       <!-- <div class="small-title">上传磅单照片</div>
       <el-upload
-        action="https://www.zthymaoyi.com/upload/admin"
+        :action="global.uploadPath"
         :show-file-list="false"
         :on-success="
           (res) => {

src/views/warehousenew/warehouseManagementLook.vue

@@ -140,18 +140,20 @@
             </ws-form-item>
           </ws-info-table>
         </div>
-        <div class="small-title" v-show="warehouseType == '1'">仓库照片</div>
+        <div class="small-title" v-show="warehouseType == '1'">附件</div>
         <div>
           <div class="addressUrls">
-          <div v-for="(items, index) in addressUrls" class="addressUrl">
+            <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :editable="false"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+          <!-- <div v-for="(items, index) in addressUrls" class="addressUrl">
             <img
               v-show="addressUrls.length > 0"
               width="100"
               height="100"
               :src="items"
               alt=""
-            />
-          </div>
+            /> -->
+          <!-- </div> -->
         </div>
         
         </div>

src/views/warehousenew/warehouseManagementNoWeightIn.vue

@@ -296,7 +296,7 @@
       </div>
       <!-- <div class="small-title">上传磅单照片</div>
        <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="
               (res) => {

src/views/warehousenew/warehouseManagementNoWeightOut.vue

@@ -253,7 +253,7 @@
       </div>
       <!-- <div class="small-title">上传磅单照片</div>
       <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="
               (res) => {

src/views/warehousenew/warehouseManagementPerfectDelivery.vue

@@ -440,7 +440,7 @@
       </div>
       <div class="small-title">上传磅单照片</div>
       <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="
               (res) => {

src/views/warehousenew/warehouseManagementPerfectput.vue

@@ -544,7 +544,7 @@
       </div>
       <div class="small-title">上传磅单照片</div>
        <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="
               (res) => {

src/views/warehousenew/warehouseManagementPut.vue

@@ -332,7 +332,7 @@
         </div>
       </div>
       <div class="small-title">上传磅单照片</div>
-      <el-upload action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false" :on-success="
+      <el-upload :action="global.uploadPath" :show-file-list="false" :on-success="
           (res) => {
             uploadSuccessHandle1(res)
           }

src/views/warehousenew/warehouseManagementTare.vue

@@ -238,7 +238,7 @@
       </div>
       <!-- <div class="small-title">上传磅单照片</div>
       <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
+            :action="global.uploadPath"
             :show-file-list="false"
             :on-success="
               (res) => {

src/views/warehousenew/warehousingOrder.vue

@@ -165,7 +165,7 @@
               <el-input disabled v-model="form.name"></el-input>
             </el-form-item>
             <el-form-item label="附件">
-              <el-upload ref='uploadfiles' :file-list='dataList' action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+              <el-upload ref='uploadfiles' :file-list='dataList' :action="global.uploadPath" list-type="picture-card"
             :on-success="handlefujian" :on-remove="handleRemove" class="photo2"  accept="image/jpg,image/jpeg,image/png">
               <i class="el-icon-plus"></i>
               </el-upload>