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

config/index.js

@@ -7,8 +7,8 @@ const os = require('os')
 
 const networkInterfaces = os.networkInterfaces()
 
-// const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address
+const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address
-const ip = '127.0.0.1'
+// const ip = '127.0.0.1'
 module.exports = {
   dev: {
     // Paths

src/api/Outsourcing/OutsourcingPaymentPlanManagement.js

@@ -3,11 +3,11 @@ import state from '@/store'
 
 // 查询表格数据
 export function searchtable(check1, ManufacturerAbbreviation, check2, starttime, endTime, pageCurrent, pageSize) {
-  console.log(state.state.user.id, 22222)
   return request({
     url: '',
     method: 'post',
     data: {
+      UserID: state.state.user.id,
       type: '1',
       name: '车间生产管理工艺_外协付款_查询',
       param: '外协厂家_check=' + check1 + '&外协厂家=' + ManufacturerAbbreviation + '&时间_check=' + check2 + '&开始时间=' + starttime + '&结束时间=' + endTime,

src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue

@@ -218,6 +218,7 @@ export default {
       var check2 = 0
       this.ManufacturerName ? check = 1 : check = 0
       searchtable(check, this.ManufacturerName, check2, '', '', this.pageCurrent, this.pageSize).then(response => {
+        console.log(response.data)
         this.loading = false
         if (response.data.rows.length !== 0) {
           this.tableData = response.data.rows

src/views/WorkshopProcurement/OfflineProcurement/index.vue

@@ -81,13 +81,8 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-<<<<<<< HEAD
-      <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable()">查询</el-button>
-      <el-button class="button111" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购计划单</el-button>
-=======
       <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable()">查询</el-button>
       <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购计划单</el-button>
->>>>>>> 6d4033c92a46c968832636b84ef2c64c7b192fe4
       <!--<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">-->
       <!--<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存采购计划单</el-button>-->
       <!--</el-tooltip>-->

src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue

@@ -20,10 +20,6 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-<<<<<<< HEAD
-        <el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
-        <el-button type="primary" icon="el-icon-download" plain size="small" @click="exportExcel()">导出</el-button>
-=======
         <span>备料时间段:</span>
         <el-date-picker
           v-model="dateRange"
@@ -39,7 +35,6 @@
           end-placeholder="结束日期"/>
         <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
         <el-button type="primary" icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
->>>>>>> 6d4033c92a46c968832636b84ef2c64c7b192fe4
       </div>
     </el-card>
     <el-card style="width: 76%">