更新

src/views/MarketingCenter/BidBond/index.vue

@@ -15,7 +15,7 @@
           :value="item.value"/>
       </el-select>
       <span style="margin-left: 10px">投标人：</span>
-      <el-input v-model="Bidder" clearable size="small" style="width:100px" placeholder="请选择" readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1" @clear="clear()"/>
+      <el-input v-model="Bidder" clearable size="small" style="width:100px" placeholder="请选择" readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
       <span style="margin-left: 10px">开始日期：</span>
       <el-date-picker
         v-model="startTime"
@@ -184,6 +184,7 @@
         <div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px">
           <el-tree
             :data="dataPeople"
+            :default-expanded-keys="treeData"
             node-key="id"
             style="width: 150px;float: left"
             height="400"
@@ -415,6 +416,7 @@ export default {
   },
   data() {
     return {
+      treeData: [7],
       entryName: [],
       plannedTime: [],
       disabled: false,
@@ -581,6 +583,9 @@ export default {
       this.PageCurrent = val
       this.fetchTableData1()
     },
+    searchPer() {
+      this.getData(getTablePeople, 'ListPeople', 7)
+    },
     handleNodeClick(data) { // 树节点点击
       this.getData(getTablePeople, 'ListPeople', data.id)
     },

src/views/MarketingCenter/CRM/index.vue

@@ -187,12 +187,23 @@
         </el-card>
       </el-col>
     </el-row>
+    <el-dialog
+      :visible.sync="dialogVisible"
+      title="提示"
+      width="30%">
+      <span>该人员已经是销售经理了，是否还要继续添加</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="addPer">确 定</el-button>
+      </span>
+    </el-dialog>
     <!--选择人员-->
     <el-dialog :visible.sync="dialogFormVisiblePeople" title="人员信息" center width="750px">
       <div style="height: 420px">
         <div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px">
           <el-tree
             :data="dataPeople"
+            :default-expanded-keys="treeData"
             node-key="id"
             style="width: 150px;float: left"
             height="400"
@@ -200,7 +211,7 @@
             @node-click="handleNodeClick"
           />
         </div>
-        <el-table :data="ListPeople" height="400" style="width: 400px;float: left;margin-left: 30px" @row-click="handleChange">
+        <el-table :data="ListPeople" height="400" style="width: 400px;float: left;margin-left: 30px" highlight-current-row @row-click="handleChange">
           <el-table-column label="考勤编号" align="center" >
             <template slot-scope="scope">
               {{ scope.row.考勤编号 }}
@@ -230,7 +241,7 @@
     <el-dialog :title="title1" :visible.sync="dialogFormVisible1" center width="400px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" class="demo-ruleForm" style="margin: auto">
         <el-form-item label="营销经理" prop="营销经理">
-          <el-input v-model="form1.营销经理" clearable size="small" style="width:200px" placeholder="请选择营销经理" readonly @dblclick.native="dialogFormVisiblePeople = true"/>
+          <el-input v-model="form1.营销经理" clearable size="small" style="width:200px" placeholder="请选择营销经理" readonly @dblclick.native="dialogFormVisiblePeople = true;searchPer()"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -322,13 +333,15 @@
 
 <script>
 import elInput from 'element-ui/packages/input'
-import { searchValue, selectAdress, selectCustomer, getTree, tree, getTablePeople, selectMarketingManager, selectCustomerOfName, initCustomer, deleteCustomer, deleteMarketingManager, addMarketingManager, editMarketingManager, addCustomer, selectAdressOfID, editCustomer } from '@/api/MarketingCenter/CRM'
+import { searchValue, selectAdress, selectCustomer, getTree, tree, getTablePeople, selectMarketingManager, selectCustomerOfName, initCustomer, deleteCustomer, deleteMarketingManager, addMarketingManager, editMarketingManager, addCustomer, selectAdressOfID, editCustomer, addPer } from '@/api/MarketingCenter/CRM'
 export default {
   components: {
     elInput
   },
   data() {
     return {
+      dialogVisible: false,
+      treeData: [7],
       a: '', // 营销经理地区流水号
       b: '', // 省份
       c: '', // 客户流水号
@@ -433,6 +446,9 @@ export default {
       this.pageCurrent = val
       this.getTable(selectCustomer, [this.AdressID, this.pageCurrent, this.pageSize], ['tableData2', 'total', 'loading2'])
     },
+    searchPer() {
+      this.getData(getTablePeople, 'ListPeople', 7)
+    },
     handleNodeClick(data) { // 树节点点击
       this.getData(getTablePeople, 'ListPeople', data.id)
     },
@@ -520,11 +536,58 @@ export default {
         })
       }
       if (this.flag === 1) {
-        this.addTable(addMarketingManager, [this.peopleid, 1], 'form1', a)
+        addMarketingManager(this.peopleid, 1).then(response => {
+          console.log(response)
+          if (response.data.hasOwnProperty('output') === false) {
+            if (response[0].result === '0') {
+              this.$notify.error(`增加失败`)
+            }
+          } else {
+            console.log(response)
+            if (response.data.result[0].result === '0') {
+              this.$notify.error(`增加失败`)
+            }
+            if (response.data.result[0].result === '1' && response.data.output[0].导入类型 === '1') {
+              this.dialogFormVisible1 = false
+              this.$notify.success('增加成功')
+              this.loading3 = true
+              selectMarketingManager(1).then(response => {
+                this.loading3 = false
+                for (let i = 0; i < response.data.length; i++) {
+                  response.data[i].出生日期 = (response.data[i].出生日期).split(' ')[0]
+                }
+                this.tableData3 = response.data
+              })
+            }
+            if (response.data.output[0].导入类型 === '2') {
+              this.dialogVisible = true
+            }
+          }
+        })
+        // this.addTable(addMarketingManager, [this.peopleid, 1], 'form1', a)
       } else {
         this.editTable(editMarketingManager, [this.peopleid, this.a], 'form1', a)
       }
     },
+    addPer() {
+      addPer(this.peopleid, 1).then(response => {
+        if (response.data[0].result === '0') {
+          this.$notify.error(`增加失败`)
+        } else {
+          this.dialogFormVisible1 = false
+          this.dialogVisible = false
+          this.$notify.success('增加成功')
+          this.loading3 = true
+          selectMarketingManager(1).then(response => {
+            this.loading3 = false
+            for (let i = 0; i < response.data.length; i++) {
+              response.data[i].出生日期 = (response.data[i].出生日期).split(' ')[0]
+            }
+            this.tableData3 = response.data
+          })
+        }
+      })
+    },
     handleEditMarketingManager(row) {
       this.dialogFormVisible1 = true
       this.title1 = '编辑'

src/views/MarketingCenter/ContractCapitalManagement/index.vue

@@ -278,7 +278,7 @@
               size="mini"
               type="danger"
               icon="el-icon-sort"
-              @click="TransferPlan(scope.row)">转移计划</el-button>
+              @click="TransferPlan(scope.row)">收款转移</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/MarketingCenter/ContractInformationManagement/index.vue

@@ -615,7 +615,7 @@ export default {
       tableData2: [], // 机床信息表
       tableData3: [], // 营销经理表
       PageCurrent: 1,
-      PageSize: 10,
+      PageSize: 20,
       total: null,
       PageCurrent1: 1,
       PageSize1: 10,
@@ -695,6 +695,7 @@ export default {
       this.getSelect(money, ['付款方式', '付款方式代码'], 'money')
     },
     openName() {
+      this.searchName()
       this.name = ''
       this.tableData3 = []
       this.dialogFormVisiblePeople = true
@@ -1151,6 +1152,7 @@ export default {
     },
     openBidding() {
       this.dialogFormVisibleBidding = true
+      this.searchBidding()
     },
     searchBidding() {
       selectBidBond(0, '', 0, '', 1, this.enterprise, 0, '', 0, '').then(response => {