20200408llj

src/api/MarketingCenter/CreateProject.js

@@ -49,7 +49,7 @@ export function addList() {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '基础表_合同信息表_制造部_增加数据',
-      param: '项目名称=' + arguments[0] + '&备注=' + arguments[1] + '&合同签订日期=' + arguments[2]
+      param: '项目名称=' + arguments[0] + '&备注=' + arguments[1] + '&合同签订日期=' + arguments[2] + '&自家创建人员编号=' + arguments[3]
     }
   })
 }

src/main.js

@@ -25,6 +25,10 @@ import elDragDialog from '@/directive/el-dragDialog'
 // 全局数字、金额输入框组件
 import directive from './components/AmountInputBox/index.js'
 Vue.use(directive)
+import axios from 'axios' // 引入axios
+Vue.prototype.$axios = axios // 修改原型链
+
+// axios.defaults.withCredentials = true
 
 Vue.use(elDragDialog)
 Vue.component('barcode', VueBarcode)

src/utils/request.js

@@ -26,6 +26,7 @@ export const MESUploadFile = `http://123.56.95.229:8010/submit/MESUploadFile.ash
 export const MESDownloadFile = `http://123.56.95.229:8010/submit/MESDownloadFile.ashx`
 const service = axios.create({
   baseURL: `http://123.56.95.229:8010/submit/MESCommonBase.ashx`,
+  // baseURL: `http://192.168.1.192:8045/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service

src/views/ManufacturingCenter/ProductionPlanQuery/index.vue

@@ -23,6 +23,7 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"/>
             <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;searchTable()">查询</el-button>
+            <!--<el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="total=0;pageSize = 20;pageCurrent = 1;loginsession()">session</el-button>-->
             <el-tooltip :open-delay="1200" effect="dark" content="只查询加急的零件" placement="top">
               <el-checkbox v-model="all" size="small">加急</el-checkbox>
             </el-tooltip>
@@ -32,7 +33,7 @@
       </div>
     </div>
     <el-card>
-      <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" height="570" style="width: 1000px; margin: 3px 0" size="mini" border highlight-current-row element-loading-text="拼命加载中">
+      <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" height="570" style="width: 1090px; margin: 3px 0" size="mini" border highlight-current-row element-loading-text="拼命加载中">
         <el-table-column label="机床图号" prop="机床图号" align="center" width="140px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
@@ -79,6 +80,11 @@
             {{ scope.row.投产时间 | formatTime }}
           </template>
         </el-table-column>
+        <el-table-column label="计划员" align="center" width="90" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block">
         <el-pagination
@@ -118,6 +124,16 @@ export default {
     this.projectChange()
   },
   methods: {
+    loginsession() {
+      this.$axios({
+        methods: 'post',
+        url: 'http://192.168.1.192:8045/submit/SessionID.ashx?userName=0000',
+        data: {
+          userName: '0000'
+        }
+      }).then(res => {
+      })
+    },
     projectChange() {
       this.machineName = []
       this.machineNameValue = ''

src/views/MarketingCenter/CreateProject/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card style="padding: 3px 0px 3px 0px;width: 1135px">
+    <el-card style="padding: 3px 0px 3px 0px;width: 1238px">
       <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:180px;margin: 0px 0px" @change="PageSize = 10;PageCurrent = 1;fetchTableData1()">
         <el-option
           v-for="item in entryName"
@@ -48,7 +48,7 @@
       <el-button icon="el-icon-bottom" type="success" plain size="small" style="margin-left: 15px" @click="exportExcel()">导出</el-button>
     </el-card>
     <el-row>
-      <el-col style="width: 680px">
+      <el-col style="width: 783px">
         <el-card>
           <el-table v-loading="listLoading" :data="tableData1" :row-key="getRowKeys" :expand-row-keys="expands" style="width: 100%" height="700" border stripe size="mini" @row-click="selectMachine">
             <el-table-column align="center" label="合同编号" prop="合同编号" width="120px">
@@ -73,6 +73,11 @@
                 {{ scope.row.合同信息备注 }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="创建人" width="90px">
+              <template slot-scope="scope">
+                {{ scope.row.自家项目创建人 }}
+              </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" width="130px">
               <template slot-scope="scope">
                 <el-button style="margin-left: 5px" size="mini" type="text" icon="el-icon-circle-plus-outline" @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
@@ -187,6 +192,7 @@
 import elInput from 'element-ui/packages/input'
 import { getNowTime } from '@/utils/tool'
 import { initProject, searchTable1, selectMachine, addList, editchar, delList, submitMachine, editMachine, delMachine } from '@/api/MarketingCenter/CreateProject'
+import { mapGetters } from 'vuex'
 export default {
   components: {
     elInput
@@ -245,10 +251,16 @@ export default {
       flag: ''
     }
   },
+  computed: {
+    ...mapGetters([
+      'id'
+    ])
+  },
   created() {
     this.init()
     // this.fetchTableData1()
   },
+
   methods: {
     // EXCEL 导出
     // 姜福壮
@@ -364,7 +376,8 @@ export default {
       })
     },
     addTableData1() {
-      addList(this.form.EntryName, this.form.remark, this.form.contractSigningDate).then(response => {
+      console.log(this.id, 909090)
+      addList(this.form.EntryName, this.form.remark, this.form.contractSigningDate, this.id).then(response => {
         this.dialogFormVisible1 = false
         if (response.data[0].result === '1') {
           this.$message.success('添加成功')