1 year ago · d5e6cded0a
--- a/public/index.html
+++ b/public/index.html
@@ -6,7 +6,7 @@
 
															     <meta name="viewport" content="width=device-width,initial-scale=1.0">
														
 
															     <link rel="icon" href="<%= BASE_URL %>favicon.ico>">
														
 
															     <script type="text/javascript" src="./static/tinymce/tinymce.min.js"></script>
														
 
															-    <title>荆州蓝领通</title>
														
 
															+    <title>长艺收入支出系统</title>
														
 
															   </head>
														
 
															   <body>
														
 
															     <noscript>
														
--- a/src/assets/logo.png
+++ b/src/assets/logo.png
--- a/src/assets/logo_cy_login.png
+++ b/src/assets/logo_cy_login.png
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -1,8 +1,8 @@
 
															 <template>
														
 
															   <div class="login-container">
														
 
															-    <div class="login-form">
														
 
															-      <h3>
														
 
															-        <img src="../assets/logo.png" width="424" height="48"/>
														
 
															+    <div class="login-form" style="margin-top:0px">
														
 
															+      <h3 style="margin-left:-12px">
														
 
															+        <img src="../assets/logo_cy_login.png"/>
														
 
															       </h3>
														
 
															       <el-card class="box-card">
														
 
															         <el-tabs v-model="activeName" @tab-click="handleTabClick">
														
--- a/src/views/base/fundIncomeInfo-list.vue
+++ b/src/views/base/fundIncomeInfo-list.vue
@@ -89,7 +89,7 @@
 
															         </el-table-column> -->
														
 
															         <el-table-column label="保存" fixed>
														
 
															           <template slot-scope="{row}" >
														
 
															-            <el-button type="primary" size="mini" @click="handleSave(row)" plain>保存</el-button>
														
 
															+            <el-button type="primary" v-if="!row.isSum" size="mini" @click="handleSave(row)" plain>保存</el-button>
														
 
															           </template>
														
 
															         </el-table-column>
														
 
															         <el-table-column  prop="serialNumber" fixed label="序号">
														
@@ -119,8 +119,10 @@
 
															         </el-table-column>
														
 
															         <el-table-column  prop="accountName"  label="账户名称" width="180">
														
 
															             <div class="item" slot-scope="scope">
														
 
															+              <div v-if="!scope.row.isSum">
														
 
															                 <el-input size="mini" class="item__input" v-model="scope.row.accountName" @blur="save(scope.row)"></el-input>
														
 
															                 <div class="item__txt">{{scope.row.accountName}}</div>
														
 
															+              </div>
														
 
															             </div>
														
 
															         </el-table-column>
														
 
															         <el-table-column  prop="curMonthReceived"  label="本月到账资金" width="200">
														
@@ -167,7 +169,7 @@
 
															                 <div class="item__txt">{{scope.row.incomeTimeRange}}</div>
														
 
															             </div> -->
														
 
															         </el-table-column>
														
 
															-        <el-table-column  prop="incomeType"  label="收入类型" width="120">
														
 
															+        <el-table-column  prop="incomeTypeN"  label="收入类型" width="120">
														
 
															             <!-- <div class="item" slot-scope="scope">
														
 
															                 <el-select size="mini" v-model="scope.row.incomeType" class="item__input" placeholder="请选择" @change="save(scope.row)"  >
														
 
															                   <el-option
														
@@ -196,7 +198,7 @@
 
															                 <div class="item__txt">{{scope.row.endDateStr}}</div>
														
 
															             </div> -->
														
 
															         </el-table-column>
														
 
															-        <el-table-column  prop="incomeDepartment"  label="收入实现部门"  width="200">
														
 
															+        <el-table-column  prop="departmentStr"  label="收入实现部门"  width="200">
														
 
															             <!-- <div class="item" slot-scope="scope">
														
 
															                 <el-input size="mini" class="item__input" v-model="scope.row.incomeDepartment" @blur="save(scope.row)"></el-input>
														
 
															                 <div class="item__txt">{{scope.row.incomeDepartment}}</div>
														
@@ -204,14 +206,18 @@
 
															         </el-table-column>
														
 
															         <el-table-column  prop="accountingName"  label="会计主体名称" width="200">
														
 
															             <div class="item" slot-scope="scope">
														
 
															+              <div v-if="!scope.row.isSum">
														
 
															                 <el-input size="mini" class="item__input" v-model="scope.row.accountingName" @blur="save(scope.row)"></el-input>
														
 
															                 <div class="item__txt">{{scope.row.accountingName}}</div>
														
 
															+              </div>
														
 
															             </div>
														
 
															         </el-table-column>
														
 
															         <el-table-column  prop="bak"  label="备注" width="180">
														
 
															             <div class="item" slot-scope="scope">
														
 
															+              <div v-if="!scope.row.isSum">
														
 
															                 <el-input size="mini" class="item__input" v-model="scope.row.bak" @blur="save(scope.row)"></el-input>
														
 
															                 <div class="item__txt">{{scope.row.bak}}</div>
														
 
															+              </div>
														
 
															             </div>
														
 
															         </el-table-column>
														
 
															         <el-table-column  prop="yearMonthStr"  label="所属年月" width="120"></el-table-column>
														
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -2,7 +2,7 @@
 
															   <el-container class="outter-container">
														
 
															     <el-header>
														
 
															       <h3>
														
 
															-          <img src="../../assets/logo.png" height="50" width="350" />
														
 
															+          <img src="../../assets/logo.png" height="45" width="450" />
														
 
															       </h3>
														
 
															       <div class="user-info">
														
 
															         <el-dropdown @command="handleCommand">