Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

src/api/MarketingCenter/ContractInformationManagement.js

@@ -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/MaterialManagement.js

@@ -41,6 +41,17 @@ export function initDepartmentName() {
     }
   })
 }
+export function yanzheng(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '库存管理_供货商验证_查询数据',
+      param: '供货商=' + num
+    }
+  })
+}
 export function initMaterialCategory(check, DepartmentValue) {
   return request({
     url: '',

src/utils/request.js

@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service

src/views/MarketingCenter/ContractInformationManagement/index.vue

@@ -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

src/views/PurchasingCenter/MaterialManagement/index.vue

@@ -566,7 +566,8 @@ import {
   getMaterial,
   searchmateria5,
   Dahui,
-  Tongguo
+  Tongguo,
+  yanzheng
 } from '@/api/PurchasingCenter/MaterialManagement'
 import { mapGetters } from 'vuex'
 
@@ -755,6 +756,8 @@ export default {
     AddGonghuoshang(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
+          yanzheng(this.form3.供货商名称).then(response => {
+            if (response.data[0].Column1 === 0) {
               AddGonghuoshang(this.form3.供货商名称).then(response => {
                 if (response.data[0].result === '1') {
                   this.$message.success('添加成功')
@@ -765,6 +768,10 @@ export default {
                   this.$message.error('添加失败')
                 }
               })
+            } else {
+              this.$message.error('该供货商已存在')
+            }
+          })
         }
       })
     },
@@ -852,7 +859,7 @@ export default {
       this.form.物料型号 = row.物料型号
       this.form.计量单位流水号 = row.计量单位流水号
       this.form.物料来源流水号 = row.物料来源流水号
-      this.form.GonghuoshangValue = parseInt(row.供货商流水号)
+      parseInt(row.供货商流水号) === 721 ? this.form.GonghuoshangValue = 1 : this.form.GonghuoshangValue = parseInt(row.供货商流水号)
       this.getSelect(initMaterialCategory, ['物料类别', '物料类别流水号'], 'MaterialCategory1')
       this.getSelect(initMaterialVariety, ['物料品种', '物料品种流水号'], 'MaterialVariety1', row.物料类别流水号)
     },