样式修改

src/pages/financial/financalDocument/BasicDocuments.vue

@@ -92,6 +92,7 @@
   .page_bdm ._margin_b15{margin-bottom: 15px;}
   .page_bdm ._pay_box table tr td{text-align: center}
   .page_bdm .w890px{width: 890px;padding: 0;margin: 0;}
+  ._pb_son2::after{content: '';width: 4px;height: 100%;background-color: #2BBB7E;display: inline-block;position: absolute;clear: both;left: 20px;top: 35px;z-index: 1}
 
   .page_bdm .w600px{
     width: 600px;
@@ -570,7 +571,7 @@
       </el-popover> -->
       <div class="_process_box">
         <template v-for="(item,index) in GetDetail.AuditSteps">
-          <div class="_pb_son clearfix" v-if="item.NextStep==1 && GetDetail.Status==1 && item.AuditWay==2">
+          <div class="_pb_son _pb_son2 clearfix" v-if="item.NextStep==1 && GetDetail.Status==1 && item.AuditWay==2">
             <div class="_left_radius _left_radius_sus" v-if="item.NextStep==1">待审</div>
             <p class="_name">
               <span class="_n">{{item.AuditDescription}}</span><span class="_sm _huoqian">({{item.AuditWayName}})</span>
@@ -912,7 +913,7 @@
               </ul>
             </div>
           </div>
-          <div class="_pb_son clearfix" v-if="item.NextStep==1 && GetDetail.Status==1 && item.AuditWay!=2 && MsgUrl" >
+          <div class="_pb_son _pb_son2 clearfix" v-if="item.NextStep==1 && GetDetail.Status==1 && item.AuditWay!=2 && MsgUrl" >
             <div class="_left_radius _left_radius_sus" v-if="item.Status==1">待审</div>
             <p class="_name"> <span class="_n">{{item.AuditDescription}}</span><span class="_sm _huoqian" v-if="item.AuditWay==3">（{{item.AuditWayName}}）</span></p>
             <div class="_right_content _padd_left_10">
@@ -1212,7 +1213,7 @@
         </div>
       </div>
     </div>
-    <div class="_pb_son clearfix" v-if="item.Sort==0 || (item.Status==2 && item.Sort!=0) || (item.Status==4)" >
+    <div class="_pb_son _pb_son2 clearfix" v-if="item.Sort==0 || (item.Status==2 && item.Sort!=0) || (item.Status==4)" >
       <div class="_left_radius" v-if="item.Sort==0">发起</div>
       <div class="_left_radius" v-if="item.Sort!=0 && item.Status==2">通过</div>
       <div class="_left_radius _left_radius_err" v-if="item.Status==4">驳回</div>

src/pages/financial/financalDocument/CapitalAllocation.vue

@@ -129,6 +129,87 @@
         </li>
       </ul>
     </div>
+    <!-- <el-form label-width="100px" class="form">
+      <el-row :gutter="20">
+        <el-col :span="4">
+          <el-form-item :label="$t('fnc.djbianhao')">
+            <el-input v-model="msg.FrID"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item :label="$t('system.table_company')">
+            <el-select v-model="msg.RB_Branch_Id" :placeholder="$t('rule.company')" @change="getDepartment(msg.RB_Branch_Id),msg.RB_Depart_Id = -2">
+              <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
+              <el-option v-for='item in CompanyList'
+                         :label='item.SName'
+                         :value='item.SId'
+                         :key='item.SId'>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item :label="$t('admin.admin_Department')">
+            <el-select v-model="msg.RB_Depart_Id" :placeholder="$t('rule.qxzbmen')" @change="getEmployee(msg.RB_Depart_Id), msg.UpdateBy='-1'">
+              <el-option :value="-2" :label="$t('pub.unlimitedSel')"></el-option>
+              <el-option v-for='item in DepartmentList'
+                         :label='item.DeptName'
+                         :value='item.DeptId'
+                         :key='item.DeptId'>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item :label="$t('fnc.zhidanren')">
+            <el-select  filterable  v-model='msg.UpdateBy'>
+              <el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
+              <el-option v-for='item in EmployeeList'
+                         :label='item.EmployeeName'
+                         :value='item.Id'
+                         :key='item.Id'>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('fnc.zdriqi')">
+            <el-date-picker
+              @change="timeAdd(1)"
+              v-model="productionDate"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              range-separator="至">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="4">
+          <el-form-item :label="$t('admin.admin_status')">
+            <el-select  v-model="msg.Status" filterable>
+              <el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
+              <el-option v-for='item in StatusList'
+                         :label='item.Name'
+                         :value='item.ID'
+                         :key='item.ID'>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('fnc.jiaoyiriqi')">
+            <el-date-picker
+              @change="timeAdd(2)"
+              v-model="productionDate2"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              :range-separator="$t('restaurant.res_To')">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form> -->
     <div class="page_CapitalAllocation_list">
       <table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
         <tr>
@@ -324,9 +405,16 @@
         }
         msg.School_Id = id;
         getDeptPage(msg).then(res => {
+          console.log(res,'数据');
           this.DepartmentList=res.Data.PageData;
         }).catch(() => {
         })
+
+        // this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {
+        //   if(res.data.resultCode == 1) {
+        //     this.DepartmentList = res.data.data;
+        //   }
+        // }, err => {})
       },
       timeAdd: function (t) {  // 日期格式
         if (t===1) {