Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/financial/accDetail/CashAccDetail.vue

@@ -175,7 +175,7 @@
           <td> {{ moneyFormat(StartMoney) }} </td>
         </tr>
         <tr v-for=" ( item , index ) in DataList ">
-          <td>
+          <td style="width:50px;">
             <input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
           </td>
           <td> {{ item.BName }} </td>

src/pages/financial/accDetail/CompanyAccDetail.vue

@@ -385,7 +385,7 @@
                 <template v-for="(file,fIndex) in saveMsg">
                   <div v-if="file.Type==3">
                     <div style="width:100%;height:100%;overflow: hidden;">
-                      <img :src="file.Url?file.Url:file.Content" @click="showUpLoadFile(file)">
+                      <img style="width:100%;" :src="file.Url?file.Url:file.Content" @click="showUpLoadFile(file)">
                     </div>
                     <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
                   </div>
@@ -978,9 +978,10 @@
             x.check=false;
           })
         }
+        this.checkList=[];
         this.DataList.forEach((x,index)=>{
-          if(x.check&&x.ClientID>0){
-            this.checkList[index] = {
+          if(x.check){
+            let obj = {
               FinanceId:x.FinanceId,
               Type:x.Type,
               ClientID:x.ClientID,
@@ -988,6 +989,7 @@
               OriginalMoney:x.OriginalMoney,
               Money:x.Money,
             }
+            this.checkList.push(obj);
           }
         })
       },

src/pages/financial/accDetail/PlatformAccDetail.vue

@@ -157,7 +157,7 @@
           <td>{{moneyFormat(StartMoney)}}</td>
         </tr>
         <tr v-for=" ( item , index ) in DataList ">
-          <td>
+          <td style="width:50px;">
             <input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
           </td>
           <td>{{ item.BName }}</td>

src/pages/financial/addFinancialProcess.vue

@@ -391,7 +391,7 @@
           <div class="approval_person_content">
             <span class="approval_span_type">{{$t('fnc.mrspliucheng')}}</span>
             <span style="float:right">
-              <el-button @click="Auditshow=true,EditAudit()" style="padding:4px" type="primary" icon="el-icon-edit"
+              <el-button @click="Auditshow=true" style="padding:4px" type="primary" icon="el-icon-edit"
                 circle></el-button>
             </span>
             <div class="approval_person_list fl">
@@ -517,7 +517,7 @@
         </ul>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <el-button size="mini" @click="Auditshow = false">取 消</el-button>
         <el-button size="mini" type="danger" @click="AuditSort">确 定</el-button>
       </span>
     </el-dialog>
@@ -884,8 +884,6 @@
             this.addMsg.ShowDepartmentList = data.ShowDepartmentList;
             this.addMsg.PropertyType = data.PropertyType;
 
-            console.log(res,'数据回来了');
-
             if (data.list && data.list[0] !== -1) {
               this.accListMsg = data.list;
             }