前端

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -417,7 +417,7 @@
           </el-button>
           <el-table highlight-current-row @cell-click='listclick' :data="inspect" style="width: 100%; margin-top: 20px"
             ref="inspect" border>
-            <el-table-column prop="qualityNo" width="130" label="业务编号"></el-table-column>
+            <el-table-column prop="qualityNo" width="160" label="业务编号"></el-table-column>
             <el-table-column prop="carNumber" label="车牌号">
               <template slot-scope="scope">
                 <span  v-if='serviceManagementType == 1||serviceManagementType == 3&&statusTypetext == "初检"&&qyJurisdiction||serviceManagementType == 3&&statusTypetext != "初检"'>

src/views/profitable/cashout.vue

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

src/views/profitable/cashoutaduit.vue

@@ -284,7 +284,7 @@
           var arr=response.addressUrl.split(',')
           for (let i = 0; i < arr.length; i++) {
             if(arr[i]!=''){
-              this.srcList.push()
+              this.srcList.push(arr[i])
             }
           }
           }

src/views/profitable/cashoutedit.vue

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

src/views/profitable/expensemanagementdetails.vue

@@ -229,7 +229,7 @@
         }
       },
       look(row){
-        this.$router.push({name:'expensemanagentlook',query:{id:row.id}})
+        this.$router.push({name:'expensemanagentlook',query:{id:row.id,expensesType:row.expensesType}})
       },
       del(status,row){
         var title=''

src/views/profitable/expensemanagentlook.vue

@@ -3,16 +3,19 @@
   <div class="container">
     <el-row class="row_top">
       <el-col :span="12">
-        <h2 class="bg-left title">查看收款信息</h2>
+        <h2 v-if='expensesType==1' class="bg-left title">查看收款信息</h2>
+        <h2 v-if='expensesType==2' class="bg-left title">查看请款信息</h2>
       </el-col>
       <el-col :span="12" class="bg-right"><el-button class="bg-bottom" type="primary" size="small" @click="returnsales()"><img width="6" height="10"
             style="vertion-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
         </el-button></el-col>
     </el-row>
     <div class="center">
-     <div style='margin:0 50px 10px;width:90%;font-weight:bold'>基本信息</div>
+     
       <div>
-        <el-form label-position="left">
+        <div style='display:flex;'>
+          <el-form label-position="left">
+            <div style='margin:0 0px 10px;font-weight:bold'>基本信息</div>
           <el-form-item label-width='100px' label="用途" span="1" prop="expensesPurpose">
               <span v-if='deptBudgetList.expensesPurpose==1'>合同费用</span>
               <span v-if='deptBudgetList.expensesPurpose==3'>库点费用</span>
@@ -55,6 +58,22 @@
           <div v-else>暂无附件</div>
         </el-form-item>
         </el-form>
+        <el-form v-if='roleName=="出纳"' label-position="left">
+               <div 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>
+            <el-form-item  label-width='100px' label="账号" span="1" prop="purpose" class="readonly">
+            {{payeeinfo.bankCard}}
+            </el-form-item>
+            <el-form-item  label-width='100px' label="开户行" span="1" prop="purpose" class="readonly">
+            {{payeeinfo.bankDeposit}}
+            </el-form-item>
+            <el-form-item  label-width='100px' label="开户支行" span="1" prop="purpose" class="readonly">
+            {{payeeinfo.bankDepositBranch}}
+            </el-form-item>
+             </el-form>
+        </div>
         <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
           <div style='margin-bottom:20px;'>费用分配</div>
           <!-- <div> -->
@@ -111,7 +130,7 @@
   </div>
 </template>
 <script>
-  import {lookexenseinfo} from '@/model/profitable/index'
+  import {lookexenseinfo,getpayeeinfo} from '@/model/profitable/index'
   export default {
     components: {},
     data() {
@@ -124,6 +143,9 @@
         deptBudgetList:{},
         makeWordData: {},
         srcList:[],
+        expensesType:'',
+        roleName:localStorage.getItem('ws-pf_roleName'),
+        payeeinfo:{},
         valueData: [{
             date: 10
           },
@@ -135,6 +157,7 @@
       }
     },
     activated() {
+      this.expensesType=this.$route.query.expensesType
       this.getList()
     },
     methods: {
@@ -149,9 +172,16 @@
           var arr=response.addressUrl.split(',')
           for (let i = 0; i < arr.length; i++) {
             if(arr[i]!=''){
-              this.srcList.push()
+              this.srcList.push(arr[i])
             }
           }
+          if(this.deptBudgetList.expensesPurpose==1){
+              getpayeeinfo({compId:localStorage.getItem('ws-pf_compId'),contractNo:response.contractNo}).toPromise()
+              .then((response1) => {
+                this.payeeinfo=response1
+                console.log(this.payeeinfo)
+              })
+            } 
         })
 
       },
@@ -240,7 +270,7 @@
   }
   /deep/.el-form{
     width:90%;
-    margin:10px auto;
+    padding:10px;
   }
   
   /deep/.el-form-item {

src/views/profitable/payment.vue

@@ -60,7 +60,7 @@
                :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">
+              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>
           </div>
@@ -107,6 +107,7 @@
         makeWordData: {},
         srcList:[],
         payeeinfo:{},
+        paymentScreenshot:[],
         textarea:'',
         valueData: [{
             date: 10
@@ -128,11 +129,14 @@
         })
         .toPromise()
         .then((response) => {
+          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])
             }
           }
           if(localStorage.getItem('ws-pf_roleName')=='出纳'){
@@ -144,7 +148,6 @@
               })
             }          
           }
-          this.paymentScreenshot=this.srcList
         })
         
       },
@@ -166,6 +169,7 @@
         this.$router.go(-1)
       },
       submit(){
+        // console.log(this.paymentScreenshot)
         this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
         this.$confirm('确定提交付款信息？', '提示', {
           confirmButtonText: '确定',

src/views/profitable/receipt.vue

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

src/views/profitable/receiptaduit.vue

@@ -53,7 +53,7 @@
           </el-form-item>
           <el-form-item label-width='100px' label="附件">
           <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">
+            :on-success="handlefujian" :on-remove="handleRemove" class="photo2" accept="image/jpg,image/jpeg,image/png">
             <i class="el-icon-plus"></i>
           </el-upload>
         </el-form-item>
@@ -130,19 +130,21 @@
         }
       },
       getList() {
+        
         lookexenseinfo({
          id:this.$route.query.id
         })
         .toPromise()
         .then((response) => {
           this.srcList=[]
+          this.paymentScreenshot=[]
           this.deptBudgetList=response
           var arr=response.addressUrl.split(',')
           for (let i = 0; i < arr.length; i++) {
           this.srcList.push({url:arr[i]})
-            
+            this.paymentScreenshot.push(arr[i])
           }
-          this.paymentScreenshot=response.addressUrl.split(',')
+          
         })
 
       },