From 670a1e20df16f9505f93a281970757b31b77a51f Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Mon, 26 Nov 2018 11:31:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=A2=E5=8A=A1?=
 =?UTF-8?q?=E9=83=A8=E5=B8=90=E5=8F=B7=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index bb20e20a..75ab765f 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -74,6 +74,21 @@
             <span>账号：4001</span>
             <span>密码：4001</span>
           </div>
+          <div class="tips">
+            <span>财务总监</span>
+            <span>账号：7001</span>
+            <span>密码：7001</span>
+          </div>
+          <div class="tips">
+            <span>出纳</span>
+            <span>账号：7002</span>
+            <span>密码：7002</span>
+          </div>
+          <div class="tips">
+            <span>会计</span>
+            <span>账号：7003</span>
+            <span>密码：7003</span>
+          </div>
         </div>
       </el-form>
     </div>

From a3654b5f36f25bac8f0c60861635d9827f10a528 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Mon, 26 Nov 2018 13:49:03 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=AE=9A=E9=A2=9D=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 75ab765f..7d9a2f97 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -89,6 +89,16 @@
             <span>账号：7003</span>
             <span>密码：7003</span>
           </div>
+          <div class="tips">
+            <span>总经理</span>
+            <span>账号：1002</span>
+            <span>密码：1002</span>
+          </div>
+          <div class="tips">
+            <span>工艺定额员</span>
+            <span>账号：6301</span>
+            <span>密码：6301</span>
+          </div>
         </div>
       </el-form>
     </div>

From d861f2af7a4cbf4c50c2a4c33784904007bbd4ca Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 26 Nov 2018 14:10:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=94=B6=E6=AC=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContractCapitalManagement.js              | 10 ++++
 .../ContractCapitalManagement/index.vue       | 50 ++++---------------
 2 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/src/api/MarketingCenter/ContractCapitalManagement.js b/src/api/MarketingCenter/ContractCapitalManagement.js
index d2fcf8a7..909c5ad7 100644
--- a/src/api/MarketingCenter/ContractCapitalManagement.js
+++ b/src/api/MarketingCenter/ContractCapitalManagement.js
@@ -87,6 +87,16 @@ export function searchProjectNumber() {
     }
   })
 }
+export function searchProjectNumber2() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '合同信息管理_项目名称_总_查询_增加限制'
+    }
+  })
+}
 export function searchProjectName(num1) {
   return request({
     url: '',
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index 33c7d669..9c479d7b 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -42,11 +42,6 @@
                   {{ scope.row.机床名称 }}
                 </template>
               </el-table-column>
-              <!--<el-table-column label="发货状态" align="center">-->
-              <!--<template slot-scope="scope">-->
-              <!--{{ scope.row.机床名称 }}-->
-              <!--</template>-->
-              <!--</el-table-column>-->
             </el-table>
           </template>
         </el-table-column>
@@ -119,12 +114,6 @@
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="200">
           <template slot-scope="scope">
-            <!--<el-button-->
-            <!--size="mini"-->
-            <!--type="primary"-->
-            <!--icon="el-icon-tickets"-->
-            <!--:disabled="scope.row.是否禁用"-->
-            <!--@click.stop="handleEdit(scope.row, scope.$index)">付款</el-button>-->
             <el-button
               :disabled="scope.row.是否禁用编辑"
               size="mini"
@@ -180,11 +169,6 @@
                   {{ scope.row.本次收款时间 }}
                 </template>
               </el-table-column>
-              <!--<el-table-column label="是否开票" align="center">-->
-              <!--<template slot-scope="scope">-->
-              <!--{{ scope.row.是否开票 }}-->
-              <!--</template>-->
-              <!--</el-table-column>-->
               <el-table-column label="操作" fixed="right" align="center" width="250">
                 <template slot-scope="scope">
                   <el-button
@@ -246,7 +230,11 @@
         </el-table-column>
         <el-table-column align="center" label="状态">
           <template slot-scope="scope">
-            <el-tag type="danger" style="width: 80px">{{ scope.row.状态 }}</el-tag>
+            <el-tag v-if="scope.row.计划付款时间===''||scope.row.计划付款时间===null" size="small">无计划</el-tag>
+            <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&parseInt(scope.row.未收金额)===0" type="success" size="small">已完成</el-tag>
+            <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='未开始'" type="primary" size="small">未开始</el-tag>
+            <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='即将拖期'" type="warning" size="small">即将拖期</el-tag>
+            <el-tag v-else-if="scope.row.计划付款时间!==''&&scope.row.计划付款时间!==null&&scope.row.状态==='已拖期'" type="danger" size="small">已拖期</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="280">
@@ -283,7 +271,7 @@
         <el-form-item label="项目名称" prop="entryNameValue" label-width="100px">
           <el-select v-model="form2.entryNameValue" clearable filterable placeholder="请输入项目名称" style="margin-left: 2px; width: 200px" size="small" @change="searchProjectName">
             <el-option
-              v-for="item in entryName"
+              v-for="item in entryName2"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
@@ -486,7 +474,7 @@
 
 <script>
 import elInput from 'element-ui/packages/input'
-import { SelectContractFunds, AccountsReceivable, editDay, TransPlanning, selectBatch, editList, delMoney, editTime, selectMax, editFukuan, fukuan, selectProvince, SelectMarketingManager, searchTable1, searchTable2, editBatchCapitalChar, deletechar, searchProjectNumber, searchProjectName, addList, PaymentPhase, dellist, selectMachine, selectBatchFundingDetails } from '@/api//MarketingCenter/ContractCapitalManagement'
+import { searchProjectNumber2, SelectContractFunds, AccountsReceivable, editDay, TransPlanning, selectBatch, editList, delMoney, editTime, selectMax, editFukuan, fukuan, selectProvince, SelectMarketingManager, searchTable1, searchTable2, editBatchCapitalChar, deletechar, searchProjectNumber, searchProjectName, addList, PaymentPhase, dellist, selectMachine, selectBatchFundingDetails } from '@/api//MarketingCenter/ContractCapitalManagement'
 export default {
   components: {
     elInput
@@ -500,7 +488,7 @@ export default {
       }
     }
     return {
-      // disabled: false,
+      entryName2: [],
       type: '',
       a: 1,
       b: 1,
@@ -612,7 +600,6 @@ export default {
     }
   },
   created() {
-    // this.fetchData()
     this.getTableData()
     this.init()
   },
@@ -620,6 +607,7 @@ export default {
     init() {
       this.getSelect(selectProvince, ['省份', '省份流水号'], 'Province')
       this.getSelect(searchProjectNumber, ['项目名称', '项目流水号'], 'entryName')
+      this.getSelect(searchProjectNumber2, ['项目名称', '项目流水号'], 'entryName2')
       this.getSelect(PaymentPhase, ['付款阶段', '付款阶段ID'], 'PaymentPhase')
       AccountsReceivable().then(response => {
         const data = response.data
@@ -685,7 +673,6 @@ export default {
               }
             }
             data[i].未收金额 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-            // data[i].已支付 === '0' ? data[i].是否禁用编辑 = false : data[i].是否禁用编辑 = true
           }
           this.tableData2 = data
           this.total2 = response.data.total
@@ -821,19 +808,6 @@ export default {
         }
       }
     },
-    // fetchData() {
-    // getTree().then(response => { // 获取人员信息树
-    //   const data = response.data
-    //   this.dataPeople = tree(data, 0)
-    // })
-    // },
-    // handleNodeClick(data) { // 树节点点击
-    //   this.getData(getTablePeople, 'ListPeople', data.id)
-    // },
-    // handleChange(row) {
-    //   this.peopleid = row.人员编号
-    //   this.peoplename = row.姓名
-    // },
     getName() {
       this.dialogFormVisiblePeople = false
       this.MarketingManagerValue = this.peoplename
@@ -910,7 +884,6 @@ export default {
         this.tableData2 = data
         this.total2 = response.data.total
       })
-      // this.getTable(searchTable2, [this.PageCurrent2, this.PageSize2, this.moneyID], ['tableData2', 'total2', 'listLoading2'])
     },
     handleSizeChange(val) {
       this.PageCurrent = 1
@@ -1102,11 +1075,6 @@ export default {
     },
     handleEdit1(row) {
       this.addForm('form3')
-      // let sum = 0
-      // this.tableData2.map(item => {
-      //   sum += parseFloat(item.本次付款)
-      // })
-      // this.max1 = this.contractTotal - (sum - row.本次付款)
       this.title = '记录阶段收款'
       this.max1 = parseFloat(row.应收金额) - parseFloat(row.已收金额)
       this.dialogFormVisible3 = true