1

src/pages/financial/accDetail/CompanyAccDetail.vue

@@ -438,6 +438,7 @@
 <script>
   import moment from "moment"
   import {getSchoolPage} from '../../../api/school/index'
+  import {UploadSelfFile} from '../../../api/common/common'
 
   export default {
     data(){
@@ -1107,13 +1108,13 @@
         newArr.push(file.file)
         let path = "/Upload/Temporary/"
         this.$message.info('上传中...')
-        this.UploadSelfFileT(path, newArr, x => {
+        UploadSelfFile('Temporary', file.file, x => {
           let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
           this.saveMsg.push({
-            Content: x.data.FilePath,
+            Content: x.FileUrl,
             ID:0,
             Type:fileTypeNumber,
-            Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
+            Url: x.FileUrl,
           })
           this.addMsg.vorcherInos = this.saveMsg;
           this.Success('上传成功');

src/pages/financial/financalDocument/WorkEntrustmentMy.vue

@@ -21,7 +21,7 @@
 .page_WorkEntrustmentMy .border_left_dashed{border-left: 1px dashed #DCDFE6}
 .page_WorkEntrustmentMy ._edHeight{height:430px;}
 .page_WorkEntrustmentMy .edHeight{display: block !important;height: 290px;}
-.page_WorkEntrustmentMy ._vMG_edit{overflow: auto;display: none;position:absolute;bottom:0;left: 0;font-family: 'PingFangSc-Fine';border-top:3px solid #38425d;background-color:#FFFFFF;padding: 10px;width: 100%;} 
+.page_WorkEntrustmentMy ._vMG_edit{overflow: auto;display: none;position:absolute;bottom:0;left: 0;font-family: 'PingFangSc-Fine';border-top:3px solid #38425d;background-color:#FFFFFF;padding: 10px;width: 100%;}
 .page_WorkEntrustmentMy ._vMG_edit ._tit{padding-left: 10px;border-left: 3px solid #E95252; font-size: 16px;color: #000000}
 .page_WorkEntrustmentMy ._vMG_edit ._tit span{color: #666666}
 .page_WorkEntrustmentMy ._vMG_edit form{padding: 25px 0}
@@ -48,7 +48,7 @@
                                     <span v-if="son=='2'">单据审批</span>
                                     <span v-if="son=='3'">客户审批</span>
                                 </template>
-                                
+
                             </p>
                         </el-col>
                         <el-col :span="4" class="border_left_dashed">
@@ -76,12 +76,12 @@
                 {{$t('system.content_noData')}}
             </div>
             <div>
-                <el-pagination 
+                <el-pagination
                     background
-                    @current-change="handleCurrentChange" 
+                    @current-change="handleCurrentChange"
                     :current-page.sync="currentPage"
                     layout="total,prev, pager, next, jumper"
-                    :page-size=msg.pageSize 
+                    :page-size=msg.pageSize
                     :total=total>
                 </el-pagination>
             </div>
@@ -104,14 +104,14 @@
                     <el-col :span="12" :offset="1">
                         <el-form-item label="受委托人：">
                             <el-select  v-model='addMsg.reciveEmpId' filterable remote reserve-keyword placeholder="请输入关键词" :remote-method="remoteMethod" :loading="loading">
-                                <el-option v-for='item in searchList' 
+                                <el-option v-for='item in searchList'
                                     :label='item.name'
                                     :value='item.empId'
                                     :key='item.empId'>
                                     <span style="float: left">{{ item.name }}</span>
                                     <span style="float: right; color: #8492a6; font-size: 13px">{{ item.departmentName }}</span>
                                 </el-option>
-                            </el-select> 
+                            </el-select>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -126,12 +126,12 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="12" class="we_btn">
-                        <button type="button" class="normalBtn" @click="user_delegate_AddAuditDelegate()">{{$t('pub.saveBtn')}}</button>                            
+                        <button type="button" class="normalBtn" @click="user_delegate_AddAuditDelegate()">{{$t('pub.saveBtn')}}</button>
                         <button class="hollowFixedBtn" type="button" @click="cancelEdit(),addShow=false">{{$t('pub.cancelBtn')}}</button>
                     </el-col>
                 </el-row>
             </el-form>
-        </div>       
+        </div>
     </div>
 </template>
 <script>
@@ -152,12 +152,12 @@ export default {
                 delegateContent:'',
                 InitiatorEmpId: 0
             },
-            delegateContent:[],
+            delegateContent:[2],
             transactionDate:[],
             loading:false,
             searchList:[],
             noData:false,
-            total:0,  
+            total:0,
             currentPage:1,
             userId:0,
             defaultImg: 'this.src="' + require("../image/default_head_img.jpg") + '"'
@@ -182,12 +182,12 @@ export default {
             this.delegateContent = [];
             this.transactionDate = [];
         },
-        timeAdd(){  // 日期格式        
+        timeAdd(){  // 日期格式
             if(!this.transactionDate){
                 this.msg.startDate = '';
                 this.msg.endDate = '';
-                return 
-            }            
+                return
+            }
             this.addMsg.startDate = this.transactionDate[0];
             this.addMsg.endDate = this.transactionDate[1];
         },
@@ -221,13 +221,13 @@ export default {
                     }else{
                         this.$message.error(res.data.message);
                     }
-                }, err => {})                  
+                }, err => {})
             }).catch(() => {
                 this.$message({
                     type: 'info',
                     message: '已取消'
                 });
-            });          	
+            });
         },
         user_delegate_AddAuditDelegate(){ // 新增委托
             if(this.delegateContent.length<=0){
@@ -245,7 +245,7 @@ export default {
             }
             if(this.addMsg.startDate==''){
                 return this.$message.error('请选择时间范围！');
-            }            
+            }
             this.apipost('user_delegate_AddAuditDelegate',this.addMsg, res => {
                 if(res.data.resultCode == 1) {
                     this.addShow = false;
@@ -255,7 +255,7 @@ export default {
                     this.$message.error(res.data.message);
                 }
                 this.getList();
-            }, err => {})	
+            }, err => {})
         },
         remoteMethod(query) {  // 远程搜索
             if (query !== '') {
@@ -265,7 +265,7 @@ export default {
                         if (res.data.data.length > 1) {
                             this.searchList = [];
                         }
-                        this.searchList = res.data.data;                   
+                        this.searchList = res.data.data;
                         this.searchList.forEach((x, index) => {
                             this.$set(this.searchList, index, x);
                         });

src/pages/financial/financalDocument/addFinancialDocuments.vue

@@ -670,7 +670,7 @@
             </p>
           </template>
           <p>
-            {{$t('visa.v_yewuyuan')}}：<span class="_r_name _jump_page">{{emplyeeName}}</span>
+            集团名称：<span class="_r_name _jump_page">{{emplyeeName}}</span>
           </p>
         </div>
         <div class="_explain">

src/pages/financial/financalDocument/addReceivablesDocuments.vue

@@ -572,7 +572,7 @@
             </p>
           </template>
           <p>
-            {{$t('visa.v_yewuyuan')}}：<span class="_r_name _jump_page">{{emplyeeName}}</span>
+            集团名称：<span class="_r_name _jump_page">{{emplyeeName}}</span>
           </p>
         </div>
         <div class="_explain">