营销中心

src/api/MarketingCenter/ContractCapitalManagement.js

@@ -32,15 +32,47 @@ export function searchTable1(pageCurrent, pageSize, num1, num2, num3) {
     }
   })
 }
-export function searchTable2(pageCurrent, pageSize, num1) {
+export function searchTable2(num1) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '合同资金管理_分批资金_查询',
+      name: '基础表_合同资金表明细_查询数据',
-      param: '资金ID=' + num1 + '=int',
+      param: '资金ID=' + num1 + '=int'
-      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+export function updateMoney(num1, money) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '基础表_合同资金表明细_编辑数据',
+      param: '资金明细ID=' + num1 + '&金额=' + money
+    }
+  })
+}
+export function addMoney(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '基础表_合同资金表明细_增加数据',
+      param: '资金ID=' + num1
+    }
+  })
+}
+export function deleteMoney(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '基础表_合同资金表明细_删除数据',
+      param: '资金明细ID=' + num1
     }
   })
 }

src/api/MarketingCenter/ContractInformationManagement.js

@@ -92,7 +92,7 @@ export function editchar() {
     data: {
       type: '2',
       name: '合同信息管理_合同信息_编辑',
-      param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&合同信息备注=' + arguments[8] + '&项目流水号=' + arguments[9] + '&付款方式代码=' + arguments[10] + '&合同签订日期=' + arguments[11] + '&招标保证金流水号=' + arguments[12]
+      param: '项目名称=' + arguments[0] + '&图纸会签节点=' + arguments[1] + '&设备预验收节点=' + arguments[2] + '&发货节点=' + arguments[3] + '&安装调试节点=' + arguments[4] + '&人员ID=' + arguments[5] + '&执行进度ID=' + arguments[6] + '&客户流水号=' + arguments[7] + '&合同信息备注=' + arguments[8] + '&项目流水号=' + arguments[9] + '&付款方式代码=' + arguments[10] + '&合同签订日期=' + arguments[11] + '&招标保证金流水号=' + arguments[12] + '&合同总额=' + arguments[13]
     }
   })
 }
@@ -189,14 +189,14 @@ export function selectProvince() {
     }
   })
 }
-export function SelectMarketingManager(code) {
+export function SelectMarketingManager() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '客户关系管理系统_按姓名查询_营销经理',
+      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '姓名=' + code
+      param: '考核部门编号=7'
     }
   })
 }
@@ -287,3 +287,35 @@ export function searchTimeAll() {
     }
   })
 }
+export function SelectPartment() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '选择营销经理_部门查询'
+    }
+  })
+}
+export function SelectMarketingManager1(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
+      param: '考核部门编号=' + num
+    }
+  })
+}
+export function addMarketingManager(MarketingManagerId, AdressID) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '客户关系管理系统_营销经理_增加数据_MESWORK',
+      param: '营销经理流水号=' + MarketingManagerId + '&省份流水号=' + AdressID + '&导入类型=0=int=output'
+    }
+  })
+}

src/api/PurchasingCenter/OfflineContractSearch.js

@@ -25,3 +25,15 @@ export function searchOfflineContractContent(num) {
     }
   })
 }
+// 打回离线合同
+export function back(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_离线合同_打回合同',
+      param: `离线合同流水号=${num}`
+    }
+  })
+}

src/views/MarketingCenter/ContractInformationManagement/index.vue

@@ -119,7 +119,7 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同总额" prop="合同总额" width="140" show-overflow-tooltip>
+        <el-table-column align="right" label="合同总额(万元)" prop="合同总额" width="140" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ Number(scope.row.合同总金额).toFixed(2) }}
           </template>
@@ -289,7 +289,7 @@
               <el-input v-model="form.bidding" readonly clearable size="small" style="width:200px" placeholder="若缴纳保证金请选择" @dblclick.native="openBidding()" @clear="clearBidding()"/>
             </el-form-item>
           </el-col>
-          <el-col v-show="isTrue" :span="12">
+          <el-col :span="12">
             <el-form-item label="合同总额" prop="contractAmount">
               <el-input v-model="form.contractAmount" clearable size="small" style="width:200px" placeholder="请输入合同金额"/>
             </el-form-item>
@@ -367,7 +367,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="付款方式" prop="付款方式">
-              <el-select v-model="form.付款方式" :disabled="disabled" placeholder="请选择付款方式" size="small" style="width: 200px">
+              <el-select v-model="form.付款方式" placeholder="请选择付款方式" size="small" style="width: 200px">
                 <el-option
                   v-for="item in money"
                   :key="item.value"
@@ -415,9 +415,9 @@
 
     <!--营销经理选择-->
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
-      <span>姓名：</span>
+      <!--      <span>姓名：</span>-->
-      <el-input v-model="name" clearable size="small" style="width: 200px"/>
+      <!--      <el-input v-model="name" clearable size="small" style="width: 200px"/>-->
-      <el-button size="small" type="success" style="margin-left: 10px" icon="el-icon-search" @click="searchName">查询</el-button>
+      <!--      <el-button size="small" type="success" style="margin-left: 10px" icon="el-icon-search" @click="searchName">查询</el-button>-->
       <!--<span>责权省份：</span>-->
       <!--<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">-->
       <!--<el-option-->
@@ -426,18 +426,25 @@
       <!--:label="item.label"-->
       <!--:value="item.value"/>-->
       <!--</el-select>-->
-      <div style="margin-top: 15px">
+      <div style="margin-top: 15px;">
-        <el-table :data="tableData3" border stripe style="width: 100%; text-align: center;" size="mini" highlight-current-row @row-click="handleChange">
+        <el-table :data="tableData4" border stripe style="width: 200px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange1">
+          <el-table-column label="部门" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.部门名称 }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-table :data="tableData3" border stripe style="width: 200px;height:350px; text-align: center;display: inline-block;vertical-align: top;" size="mini" highlight-current-row @row-click="handleChange">
           <el-table-column label="销售经理" align="center" >
             <template slot-scope="scope">
               {{ scope.row.姓名 }}
             </template>
           </el-table-column>
-          <el-table-column label="性别" align="center">
+          <!--          <el-table-column label="性别" align="center">-->
-            <template slot-scope="scope">
+          <!--            <template slot-scope="scope">-->
-              {{ scope.row.性别 }}
+          <!--              {{ scope.row.性别 }}-->
-            </template>
+          <!--            </template>-->
-          </el-table-column>
+          <!--          </el-table-column>-->
         </el-table>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -573,7 +580,7 @@
 
 <script>
 import elInput from 'element-ui/packages/input'
-import { searchTimeAll, searchTime, selectBidBond, changeExecutionProgressID, initProject, searchTable1, fetchExecutionProgress, delList, addList, executionProgressID, editchar, getTree, tree, getTablePeople, fetchCustomerData, getFileData, deleteFileData, selectMachine, selectProvince, SelectMarketingManager, submitMachine, editMachine, delMachine, money } from '@/api/MarketingCenter/ContractInformationManagement'
+import { addMarketingManager, SelectMarketingManager1, SelectPartment, searchTimeAll, searchTime, selectBidBond, changeExecutionProgressID, initProject, searchTable1, fetchExecutionProgress, delList, addList, executionProgressID, editchar, getTree, tree, getTablePeople, fetchCustomerData, getFileData, deleteFileData, selectMachine, selectProvince, SelectMarketingManager, submitMachine, editMachine, delMachine, money } from '@/api/MarketingCenter/ContractInformationManagement'
 import { upload, download } from '@/utils/request'
 export default {
   components: {
@@ -647,6 +654,7 @@ export default {
       tableData1: [], // 合同信息表
       tableData2: [], // 机床信息表
       tableData3: [], // 营销经理表
+      tableData4: [], // 部门表
       PageCurrent: 1,
       PageSize: 30,
       total: null,
@@ -714,10 +722,22 @@ export default {
   },
   methods: {
     searchName() { // 模糊查询姓名
-      SelectMarketingManager(this.name).then(response => {
+      this.tableData3 = []
+      SelectMarketingManager().then(response => {
         this.tableData3 = response.data
       })
     },
+    handleChange1(row) {
+      this.tableData3 = []
+      SelectMarketingManager1(row.考核部门编号).then(response => {
+        this.tableData3 = response.data
+      })
+    },
+    searchPartment() { // 模糊查询姓名
+      SelectPartment().then(response => {
+        this.tableData4 = response.data
+      })
+    },
     fetchData() {
       getTree().then(response => { // 获取人员信息树
         const data = response.data
@@ -734,6 +754,7 @@ export default {
       this.name = ''
       this.tableData3 = []
       this.dialogFormVisiblePeople = true
+      this.searchPartment()
     },
     getRowKeys(row) {
       return row.项目流水号
@@ -744,10 +765,13 @@ export default {
       })
     },
     handleChange(row) {
-      this.peopleid = row.营销经理流水号
+      this.peopleid = row.人员编号
       this.peoplename = row.姓名
     },
     getName() {
+      addMarketingManager(this.peopleid, 1).then(response => {
+        console.log(response, 123)
+      })
       if (this.param === 1) {
         this.dialogFormVisiblePeople = false
         this.MarketingManagerValue = this.peoplename
@@ -998,7 +1022,7 @@ export default {
       this.isTrue = false
     },
     chaEdit() {
-      editchar(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.hetongID, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber).then(response => {
+      editchar(this.form.EntryName, this.form.drawingJointSignNode, this.form.EquipmentPreAcceptanceNode, this.form.ConsignmentNode, this.form.installDebugNode, this.id1, this.form.executionProgressID, this.CustomerCode, this.form.remark, this.hetongID, this.form.付款方式, this.form.contractSigningDate, this.biddingNumber, this.form.contractAmount).then(response => {
         this.dialogFormVisible1 = false
         if (response.data[0].result === '1') {
           this.$message.success('信息更新成功')

src/views/PurchasingCenter/OfflineContract/index.vue

@@ -542,8 +542,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="供应商名称" prop="供应商名称">
+            <el-form-item label="供应商名称" prop="供应商流水号">
-              <el-select v-model="form2.供应商名称" style="width:150px" placeholder="供应商" size="small" filterable>
+              <el-select v-model="form2.供应商流水号" style="width:150px" placeholder="供应商" size="small" filterable>
                 <el-option
                   v-for="item in supplierNames"
                   :key="item.value"
@@ -785,7 +785,7 @@ export default {
       rules2: { // 离线合同表单验证规则
         离线合同编号: [{ required: true, message: '请填写离线合同编号' }],
         离线合同名称: [{ required: true, message: '请填写离线合同名称' }],
-        供应商名称: [{ required: true, message: '请选择供应商' }],
+        供应商流水号: [{ required: true, message: '请选择供应商' }],
         规定到货时间: [{ required: true, message: '请选择规定到货时间' }],
         运费: [{ required: true, message: '请填写运费' }],
         付款方式: [{ required: true, message: '请选择付款方式' }]
@@ -823,6 +823,7 @@ export default {
   created() {
     this.getPerson()
     this.projectChange()
+    this.getSupplier1()
     // this.searchTable2()
     this.searchTable11()
     this.initDirection()
@@ -1082,7 +1083,6 @@ export default {
       if (this.$refs['form2'] !== undefined) {
         this.$refs['form2'].resetFields()
       }
-      this.getSupplier1()
       this.title2 = '创建离线合同'
       getBillNum().then(response => { // 查询询价单号
         this.form2.离线合同编号 = response.data[0].单号
@@ -1095,8 +1095,6 @@ export default {
       })
     },
     getSupplier1() {
-      this.supplierNames = []
-      this.form2.供应商名称 = ''
       searchSupplier1(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.supplierNames.push({
@@ -1118,7 +1116,7 @@ export default {
             if (numGroup1.indexOf(this.form2.离线合同编号) !== -1) {
               this.$message.error('该离线合同编号已存在')
             } else {
-              addOfflineContract(this.form2.离线合同编号, this.form2.离线合同名称, this.form2.供应商名称, this.id, this.form2.规定到货时间, this.form2.离线合同备注).then(response => {
+              addOfflineContract(this.form2.离线合同编号, this.form2.离线合同名称, this.form2.供应商流水号, this.id, this.form2.规定到货时间, this.form2.离线合同备注).then(response => {
                 if (response.data[0].result === '1') {
                   this.$message.success('新建离线合同成功')
                   this.offlineContract = this.form2.离线合同编号
@@ -1142,7 +1140,7 @@ export default {
       this.form2.离线合同流水号 = row.离线合同流水号
       this.form2.离线合同编号 = row.离线合同编号
       this.form2.离线合同名称 = row.离线合同名称
-      this.form2.供应商流水号 = row.供应商流水号
+      this.form2.供应商流水号 = parseInt(row.供应商流水号)
       this.form2.供应商名称 = row.供应商名称
       this.form2.规定到货时间 = row.规定到货时间
       this.form2.离线合同备注 = row.离线合同备注

src/views/PurchasingCenter/OfflineContractSearch/index.vue

@@ -11,6 +11,12 @@
             icon="el-icon-search"
             style="margin-left:10px"
             @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+          <el-button
+            type="danger"
+            size="small"
+            icon="el-icon-back"
+            style="margin-left:10px"
+            @click="back">打回</el-button>
         </el-row>
       </div>
     </el-card>
@@ -109,7 +115,7 @@
 </template>
 
 <script>
-import { searchOfflineContract, searchOfflineContractContent } from '@/api/PurchasingCenter/OfflineContractSearch'
+import { searchOfflineContract, searchOfflineContractContent, back } from '@/api/PurchasingCenter/OfflineContractSearch'
 import QRCode from 'qrcode'
 import $ from 'jquery'
 export default {
@@ -119,6 +125,7 @@ export default {
       contractNumber: '',
       supplierName: '',
       total1: 0,
+      number: '',
       pageCurrent1: 1,
       pageSize1: 20,
       tableData1: [],
@@ -152,7 +159,28 @@ export default {
       this.pageCurrent1 = val
       this.searchTable1()
     },
+    back() {
+      this.$confirm('确定打回合同?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (this.number) {
+          back(this.number).then(response => {
+            if (response.data[0].result !== '0') {
+              this.$message.success('打回成功')
+              this.searchTable1()
+            } else {
+              this.$message.success('打回失败')
+            }
+          })
+        } else {
+          this.$message.warning('请选择要打回的合同')
+        }
+      })
+    },
     searchTable2(row) {
+      this.number = row.离线合同流水号
       searchOfflineContractContent(row.离线合同流水号).then(response => {
         this.contractDetail = response.data
         this.showOffline(row)