diff --git a/src/api/PurchasingCenter/BuyerRequestFund.js b/src/api/PurchasingCenter/BuyerRequestFund.js
index 28c3cc8b..1e66716b 100644
--- a/src/api/PurchasingCenter/BuyerRequestFund.js
+++ b/src/api/PurchasingCenter/BuyerRequestFund.js
@@ -20,7 +20,7 @@ export function searchTable1(pageCurrent, pageSize, check1, start, end, check2,
     data: {
       type: '1',
       name: '采购管理_请款表_查询数据',
-      param: '时间段_check=' + check1 + '&开始时间=' + start + '&结束时间=' + end + '&合同号_check=' + check2 + '&采购合同编号=' + num1 + '&采购员_check=' + check3 + '&采购员姓名=' + name1 + '&供应商_check=' + check4 + '&供应商名称=' + name2,
+      param: '时间段_check=' + check1 + '&开始时间=' + start + '&结束时间=' + end + '&合同号_check=' + check2 + '&采购合同编号=' + num1 + '&采购员_check=' + check3 + '&采购员流水号=' + name1 + '&供应商_check=' + check4 + '&供应商名称=' + name2,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/utils/request.js b/src/utils/request.js
index a8158773..1aed1d9b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -10,7 +10,7 @@ export const name = `OP8888`
 export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx`
 export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.1.122:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 
diff --git a/src/views/PurchasingCenter/BuyerRequestFund/index.vue b/src/views/PurchasingCenter/BuyerRequestFund/index.vue
index 762352a6..300f5fe0 100644
--- a/src/views/PurchasingCenter/BuyerRequestFund/index.vue
+++ b/src/views/PurchasingCenter/BuyerRequestFund/index.vue
@@ -20,24 +20,20 @@
       <span>合同号:</span>
       <el-input v-model="contractNum" placeholder="合同号" size="small" style="width:180px" clearable/>
       <span>采购员:</span>
-      <el-input
-        v-model="buyerName"
-        placeholder="采购员"
-        size="small"
-        readonly
-        clearable
-        style="width:100px"
-        @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true"/>
+      <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px" clearable>
+        <el-option
+          v-for="item in person"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
       <span>供应商:</span>
       <el-input
         v-model="supplierName"
         placeholder="供应商"
         size="small"
-        readonly
         clearable
-        style="width:180px"
-        @dblclick.native="dialogVisible1=true;submitDisable=true"
-        @clear="emptySupplierDetail"/>
+        style="width:180px"/>
       <el-button
         type="success"
         size="small"
@@ -48,19 +44,19 @@
 
     <el-card>
       <el-table v-loading="loading1" :data="tableData1" size="mini" border style="width: 100%;">
-        <el-table-column label="采购合同编号" min-width="150" align="center">
+        <el-table-column label="采购合同编号" min-width="100" align="center">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购合同名称" min-width="150" align="center">
+        <el-table-column label="采购合同名称" min-width="100" align="center">
           <template slot-scope="scope">
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
         <el-table-column label="规定到货时间" width="100" align="center">
           <template slot-scope="scope">
-            {{ scope.row.规定到货时间 }}
+            {{ scope.row.规定到货时间.split(' ')[0] }}
           </template>
         </el-table-column>
         <el-table-column label="供应商" min-width="200" align="center">
@@ -78,7 +74,7 @@
             {{ scope.row.付款方式内容 }}
           </template>
         </el-table-column>
-        <el-table-column label="欠款金额" min-width="100" align="center">
+        <el-table-column label="欠款金额" min-width="90" align="center">
           <template slot-scope="scope">
             {{ scope.row.欠款金额 }}
           </template>
@@ -93,7 +89,7 @@
             <el-input v-model="scope.row.本次应请款" size="mini" style="width:70px"/>
           </template>
         </el-table-column>
-        <el-table-column label="请款付款情况" width="810" align="center">
+        <el-table-column label="请款付款情况" width="900" align="center">
           <template slot-scope="scope">
             <el-table v-show="tableData11[scope.$index].length!==0" :data="tableData11[scope.$index]" size="mini" border style="width: 100%;">
               <el-table-column label="次数" min-width="60" align="center" type="index"/>
@@ -104,25 +100,25 @@
               </el-table-column>
               <el-table-column label="请款时间" width="90" align="center">
                 <template slot-scope="scope">
-                  {{ scope.row.请款时间 }}
+                  {{ scope.row.请款时间.split(' ')[0] }}
                 </template>
               </el-table-column>
-              <el-table-column label="审核情况内容" width="80" align="center">
+              <el-table-column label="审核情况" width="80" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.审核情况内容 }}
                 </template>
               </el-table-column>
-              <el-table-column label="未通过审核原因" width="80" align="center">
+              <el-table-column label="未通过审核原因" width="110" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.未通过审核原因 }}
                 </template>
               </el-table-column>
-              <el-table-column label="审批情况内容" width="80" align="center">
+              <el-table-column label="审批情况" width="80" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.审批情况内容 }}
                 </template>
               </el-table-column>
-              <el-table-column label="未通过审批原因" width="80" align="center">
+              <el-table-column label="未通过审批原因" width="110" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.未通过审批原因 }}
                 </template>
@@ -132,7 +128,7 @@
                   {{ scope.row.付款情况内容 }}
                 </template>
               </el-table-column>
-              <el-table-column label="未付款原因" width="80" align="center">
+              <el-table-column label="未付款原因" width="110" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.未付款原因 }}
                 </template>
@@ -142,7 +138,6 @@
                   <el-button
                     type="danger"
                     size="mini"
-                    icon=""
                     @click="cancelRequestFund(scope.row)">取消请款</el-button>
                 </template>
               </el-table-column>
@@ -217,15 +212,10 @@
         </el-table-column>
         <el-table-column label="规定到货时间" width="100" align="center">
           <template slot-scope="scope">
-            {{ scope.row.规定到货时间 }}
+            {{ scope.row.规定到货时间.split(' ')[0] }}
           </template>
         </el-table-column>
-        <el-table-column label="实际到货时间" width="100" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.实际到货时间 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="供应商" min-width="150" align="center">
+        <el-table-column label="供应商" min-width="250" align="center">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -257,170 +247,23 @@
         </el-table-column>
         <el-table-column label="请款时间" width="100" align="center">
           <template slot-scope="scope">
-            {{ scope.row.请款时间 }}
+            {{ scope.row.请款时间.split(' ')[0] }}
           </template>
         </el-table-column>
       </el-table>
     </el-card>
-
-    <el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
-      <el-form ref="form1" :model="form1" label-position="left" label-width="90px" class="searchForm">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="供应商名称">
-              <el-input v-model="supplierName" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="企业性质">
-              <el-input v-model="enterpriseNature" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="货期">
-              <el-input v-model="goodTime" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="注册资本">
-              <el-input v-model="registeredCapital" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="税号">
-              <el-input v-model="taxNum" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="电子邮箱">
-              <el-input v-model="EMail" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="地址">
-              <el-input v-model="address" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="账号">
-              <el-input v-model="account" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="开户行">
-              <el-input v-model="openingBank" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="电话号码">
-              <el-input v-model="phone" size="small"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="传真">
-              <el-input v-model="fax" size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-button
-              type="success"
-              size="small"
-              icon="el-icon-search"
-              @click="searchSupplier">查询</el-button>
-            <el-button
-              :disabled="submitDisable"
-              type="primary"
-              size="small"
-              icon="el-icon-check"
-              @click="submitSelectSupplier">确定</el-button>
-            <el-button
-              type="danger"
-              size="small"
-              icon="el-icon-delete"
-              @click="emptySupplierDetail">清空</el-button>
-          </el-col>
-        </el-row>
-        <el-table :data="tableData01" size="mini" style="width: 97%;max-height: 300px;margin-top:15px" height="200px" border @row-click="showSupplierDetail">
-          <el-table-column align="center" label="供应商名称" width="200">
-            <template slot-scope="scope">
-              {{ scope.row.供应商名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="企业性质">
-            <template slot-scope="scope">
-              {{ scope.row.企业性质 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="创立日期">
-            <template slot-scope="scope">
-              {{ scope.row.创立日期 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="注册资本">
-            <template slot-scope="scope">
-              {{ scope.row.注册资本 }}
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-form>
-    </el-dialog>
-
-    <el-dialog :visible.sync="dialogVisible2" title="采购员选择" center style="min-height: 300px;" width="40%">
-      <el-table
-        :data="tableData02"
-        size="small"
-        border
-        style="width: 100%;min-height:300px"
-        height="300px"
-        highlight-current-row
-        @row-click="clickBuyer">
-        <el-table-column label="考勤编号" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.考勤编号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="姓名" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="性别" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.性别 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="工作岗位" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.岗位名称 }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button :disabled="submitDisable" type="primary" size="small" icon="el-icon-check" @click="submitSelectBuyer">确定</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { searchSupplier, searchTable1, requestFund, searchCondition, cancelRequestFund, searchRequestTable, initBuyer } from '@/api/PurchasingCenter/BuyerRequestFund'
+import { searchTable1, requestFund, searchCondition, cancelRequestFund, searchRequestTable, initBuyer } from '@/api/PurchasingCenter/BuyerRequestFund'
 import { mapGetters } from 'vuex'
 
 export default {
   data() {
     return {
-      tableData02: [],
-      dialogVisible2: false,
+      personValue: '',
+      person: [],
       loading2: false,
       tableData2: [],
       tableData11: [],
@@ -430,35 +273,9 @@ export default {
       startDate: '',
       endDate: '',
       contractNum: '',
-      buyerName: '',
-      dialogVisible1: false,
       submitDisable: true,
       form1: {},
-      supplierValue: '',
       supplierName: '',
-      enterpriseNature: '',
-      createDate: '',
-      registeredCapital: '',
-      taxNum: '',
-      EMail: '',
-      address: '',
-      account: '',
-      openingBank: '',
-      phone: '',
-      fax: '',
-      goodTime: '',
-      supplierCheck1: 0,
-      supplierCheck2: 0,
-      supplierCheck3: 0,
-      supplierCheck4: 0,
-      supplierCheck5: 0,
-      supplierCheck6: 0,
-      supplierCheck7: 0,
-      supplierCheck8: 0,
-      supplierCheck9: 0,
-      supplierCheck10: 0,
-      supplierCheck11: 0,
-      supplierCheck12: 0,
       tableData01: [],
       loading1: false,
       tableData1: [],
@@ -479,98 +296,39 @@ export default {
       'id'
     ])
   },
+  created() {
+    this.initBuyer()
+  },
   methods: {
-    submitSelectBuyer() { // 确定
-      this.dialogVisible2 = false
-    },
-    clickBuyer(row) { // 点击采购员表某一行
-      this.submitDisable = false
-      this.buyerName = row.姓名
-    },
     initBuyer() { // 初始化采购人员
       initBuyer().then(response => {
-        this.tableData02 = response.data
+        for (let i = 0; i < response.data.length; i++) {
+          this.person.push({
+            text: response.data[i].姓名,
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
       })
     },
-    searchSupplier() { // 查询创立日期和注册资本大于符合条件的数据
-      this.supplierName ? this.supplierCheck1 = 1 : (this.supplierCheck1 = 0, this.supplierName = '')
-      this.enterpriseNature ? this.supplierCheck2 = 1 : (this.supplierCheck2 = 0, this.enterpriseNature = '')
-      this.createDate ? this.supplierCheck3 = 1 : (this.supplierCheck3 = 0, this.createDate = '')
-      this.registeredCapital ? this.supplierCheck4 = 1 : (this.supplierCheck4 = 0, this.registeredCapital = '')
-      this.taxNum ? this.supplierCheck5 = 1 : (this.supplierCheck5 = 0, this.taxNum = '')
-      this.EMail ? this.supplierCheck6 = 1 : (this.supplierCheck6 = 0, this.EMail = '')
-      this.address ? this.supplierCheck7 = 1 : (this.supplierCheck7 = 0, this.address = '')
-      this.account ? this.supplierCheck8 = 1 : (this.supplierCheck8 = 0, this.account = '')
-      this.openingBank ? this.supplierCheck9 = 1 : (this.supplierCheck9 = 0, this.openingBank = '')
-      this.phone ? this.supplierCheck10 = 1 : (this.supplierCheck10 = 0, this.phone = '')
-      this.fax ? this.supplierCheck11 = 1 : (this.supplierCheck11 = 0, this.fax = '')
-      this.goodTime ? this.supplierCheck12 = 1 : (this.supplierCheck12 = 0, this.goodTime = '')
-      searchSupplier(this.supplierCheck1, this.supplierName, this.supplierCheck2, this.enterpriseNature, this.supplierCheck3, this.createDate, this.supplierCheck4, this.registeredCapital, this.supplierCheck5, this.taxNum, this.supplierCheck6, this.EMail, this.supplierCheck7, this.address, this.supplierCheck8, this.account, this.supplierCheck9, this.openingBank, this.supplierCheck10, this.phone, this.supplierCheck11, this.fax, this.supplierCheck12, this.goodTime).then(response => {
-        this.tableData01 = response.data
-      })
-    },
-    submitSelectSupplier() { // 确定选择供应商
-      this.dialogVisible1 = false
-    },
-    emptySupplierDetail() { // 清空
-      this.submitDisable = true
-      this.supplierValue = ''
-      this.supplierName = ''
-      this.enterpriseNature = ''
-      this.createDate = ''
-      this.registeredCapital = ''
-      this.taxNum = ''
-      this.EMail = ''
-      this.address = ''
-      this.account = ''
-      this.openingBank = ''
-      this.phone = ''
-      this.fax = ''
-      this.goodTime = ''
-    },
-    showSupplierDetail(row) { // 点击供应商表某一行
-      this.submitDisable = false
-      this.supplierValue = row.供应商流水号
-      this.supplierName = row.供应商名称
-      this.enterpriseNature = row.企业性质
-      this.createDate = row.创立日期
-      this.registeredCapital = row.注册资本
-      this.taxNum = row.税号
-      this.EMail = row.电子信箱
-      this.address = row.地址
-      this.account = row.帐号
-      this.openingBank = row.开户行
-      this.phone = row.电话号码
-      this.fax = row.传真
-      this.goodTime = row.货期
-    },
     searchTable1() {
       this.loading1 = true
       this.tableData1 = []
       this.startDate && this.endDate ? this.check1 = 1 : this.check1 = 0
       this.contractNum ? this.check2 = 1 : this.check2 = 0
-      this.buyerName ? this.check3 = 1 : this.check3 = 0
+      this.personValue ? this.check3 = 1 : this.check3 = 0
       this.supplierName ? this.check4 = 1 : this.check4 = 0
-      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startDate, this.endDate, this.check2, this.contractNum, this.check3, this.buyerName, this.check4, this.supplierName).then(response => {
+      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startDate, this.endDate, this.check2, this.contractNum, this.check3, this.personValue, this.check4, this.supplierName).then(response => {
         for (let j = 0; j < response.data.rows.length; j++) {
-          if (response.data.rows[j].规定到货时间 !== null) {
-            response.data.rows[j].规定到货时间 = response.data.rows[j].规定到货时间.substring(0, response.data.rows[j].规定到货时间.indexOf(' '))
-          }
-          if (response.data.rows[j].实际到货时间 !== null) {
-            response.data.rows[j].实际到货时间 = response.data.rows[j].实际到货时间.substring(0, response.data.rows[j].实际到货时间.indexOf(' '))
-          }
           this.tableData11[j] = []
           searchCondition(response.data.rows[j].采购合同流水号).then(response0 => {
-            this.tableData1 = response.data.rows
-            this.total1 = response.data.total
             for (let i = 0; i < response0.data.length; i++) {
-              if (response0.data[i].请款时间 !== null) {
-                response0.data[i].请款时间 = response0.data[i].请款时间.substring(0, response0.data[i].请款时间.indexOf(' '))
-              }
               this.tableData11[j].push(response0.data[i])
             }
           })
         }
+        this.tableData1 = response.data.rows
+        this.total1 = response.data.total
       }).then(() => {
         this.loading1 = false
       })
@@ -630,12 +388,6 @@ export default {
       } else { this.checkRequest = 1 }
       searchRequestTable(this.checkRequest, this.startRequestDate, this.endRequestDate).then(response => {
         for (let j = 0; j < response.data.length; j++) {
-          if (response.data[j].规定到货时间 !== null) {
-            response.data[j].规定到货时间 = response.data[j].规定到货时间.substring(0, response.data[j].规定到货时间.indexOf(' '))
-          }
-          if (response.data[j].实际到货时间 !== null) {
-            response.data[j].实际到货时间 = response.data[j].实际到货时间.substring(0, response.data[j].实际到货时间.indexOf(' '))
-          }
           if (response.data[j].请款时间 !== null) {
             response.data[j].请款时间 = response.data[j].请款时间.substring(0, response.data[j].请款时间.indexOf(' '))
           }