资金调拨

src/components/FinancialModule/CapitalAllocationDetail.vue

@@ -16,7 +16,7 @@
   .CapitalDetail .Ca_title{
     width:190px;
     margin:auto;
-    font-size:14px;
+    font-size:16px;
     margin-top:20px;
     color:#333333;
     text-align: center;
@@ -25,13 +25,15 @@
     width:100%;
     font-size:14px;
     text-align: center;
+    margin-bottom: -8px;
   }
   .CapitalDetail .Ca_line{
     width:110px;
     height:3px;
     margin:8px auto 10px;
-    border-top:1px solid #333333;
-    border-bottom:1px solid #333333;
+    border-top:1px solid #777373;
+    border-bottom:2px solid;
+    /* border-bottom:1px solid #333333; */
   }
   .CapitalDetail .collection_Order{
     width:100%;
@@ -200,7 +202,7 @@
             <div class="Co_oderleft">
               <div class="Ca_leftOrder">
                   <div class="Ca_title">{{dataList.CompanyName}}</div>
-                  <div class="Ca_t2">资金调拨单</div>
+                  <div class="Ca_t2">{{dataList.FinanceName}}</div>
                   <div class="Ca_line"></div>
                   <div class="clearfix collection_Order">
                       <div class="Co_oderleft">
@@ -324,12 +326,12 @@
                   <div class="clearfix Ca_popDiv" v-if="dataList.AuditSteps!=''">
                     <template v-for="(item,index) in dataList.AuditSteps">
                         <p>{{item.AuditDescription}}：
-                            <template v-if="item.AuditRecordList.length>0">
-                                <span class="_r_name" v-for="(s,si) in item.AuditRecordList" v-if="s.AuditStatus==2">{{s.AuditName}} </span>
-                            </template>
+                            <template v-if="item.Status===2">
+                                <span class="_r_name" v-for="(s,si) in item.AuditRecordList">{{s.AuditName}} </span>
+                            </template>                          
                         </p>
                     </template>
-                  </div>
+                  </div>                 
               </div>
               <!-- <div style="margin:20px 0;">
                 <input type="button" class="hollowFixedBtn" value="修改"/>

src/components/FinancialModule/FinancialDocuments.vue

@@ -161,6 +161,7 @@
                             <el-option key="0" value="0" label="不限"></el-option>
                             <el-option key="1" value="1" label="收入"></el-option>
                             <el-option key="2" value="2" label="支出"></el-option>
+                            <el-option key="2" value="4" label="资金调拨"></el-option>
                         </el-select>
                     </span>
                 </li>

src/components/FinancialModule/addCapitalAllocation.vue

@@ -156,7 +156,7 @@
   <div class="page_addCapitalAllocation" v-loading="loading">
     <div class="_top">
       <p>四川和平国际旅行社有限公司</p>
-      <p><span>资金调拨单</span></p>
+      <p><span>{{msg.TemplateId==34?'总部':'分公司'}}资金调拨单</span></p>
     </div>
     <div class="_conten">
       <ul v-if="inList.length">