diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js
index a3efe934..ab95d0a1 100644
--- a/src/api/PurchasingCenter/CreateInquirySheet.js
+++ b/src/api/PurchasingCenter/CreateInquirySheet.js
@@ -89,14 +89,14 @@ export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2
   })
 }
 // 查询分配后的基本件
-export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6) {
+export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '采购管理_采购部采购_查询物料_基本件_分配后',
-      param: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}`,
+      param: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/utils/request.js b/src/utils/request.js
index 56ffd77d..e9cf8a39 100644
--- a/src/utils/request.js
+++ b/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.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
index 3b1930b1..c3a12a48 100644
--- a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
+++ b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
@@ -19,17 +19,6 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-<<<<<<< HEAD
-=======
-          <span>采购状态:</span>
-          <el-select v-model="purchaseStateValue" placeholder="采购状态" size="small">
-            <el-option
-              v-for="item in purchaseState"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
->>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
           <el-button
             type="success"
             size="small"
@@ -88,16 +77,11 @@
             <template slot-scope="scope">
               <template v-if="scope.row.changeSafeValue">
                 <el-input v-model="scope.row.安全库存量" class="edit-input" size="mini"/>
-<<<<<<< HEAD
                 <el-button class="cancel-btn" size="mini" icon="el-icon-refresh" type="warning" @click="cancelEdit1(scope.row)">取消</el-button>
-=======
-                <el-button class="cancel-btn" size="mini" icon="el-icon-refresh" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
->>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
               </template>
               <span v-else>{{ scope.row.安全库存量 }}</span>
             </template>
           </el-table-column>
-<<<<<<< HEAD
           <el-table-column label="设置" min-width="70" align="center">
             <template slot-scope="scope">
               <el-tooltip :open-delay="1000" effect="dark" content="设置安全库存量" placement="top">
@@ -112,8 +96,6 @@
               </el-tooltip>
             </template>
           </el-table-column>
-=======
->>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
         </el-table>
         <div class="block" style="margin-top: 10px;">
           <el-pagination
@@ -132,11 +114,7 @@
     <el-card>
       <div slot="header">
         <span>采购明细表名称:</span>
-<<<<<<< HEAD
         <el-input v-model="purchasingDetailsForm" placeholder="采购明细表名称" size="small" clearable/>
-=======
-        <el-input v-model="purchasingDetailsForm" placeholder="采购明细表号" size="small" clearable/>
->>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
         <el-button
           type="success"
           size="small"
@@ -158,15 +136,12 @@
       </div>
       <!--       -->
       <el-table v-loading="loading1" :data="tableData1" border style="max-height: 460px;" height="300px" size="mini" highlight-current-row @row-click="searchTable2">
-<<<<<<< HEAD
         <el-table-column label="分配状态" align="center" min-width="170">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.是否分配)===0" type="warning" size="small">未分配</el-tag>
             <el-tag v-if="parseInt(scope.row.是否分配)===1" type="success" size="small">已分配</el-tag>
           </template>
         </el-table-column>
-=======
->>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
         <el-table-column label="表单编号" align="center" min-width="170">
           <template slot-scope="scope">
             {{ scope.row.表单编号 }}
@@ -206,18 +181,11 @@
           @current-change="handleCurrentChange1"/>
       </div>
       <h3>合同详细信息</h3>
-<<<<<<< HEAD
       <el-table v-loading="" :data="tableData2" border style="max-height: 500px;" height="450px" size="mini">
         <el-table-column label="序号" type="index" align="center" width="110"/>
         <el-table-column label="表单编号" align="center" width="110">
           <template slot-scope="scope">
             {{ scope.row.表单编号 }}
-=======
-      <el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border style="max-height: 500px;" height="450px" size="mini" show-summary>
-        <el-table-column label="表单编号" align="center" width="110">
-          <template slot-scope="scope">
-            {{ scope.row.离线合同编号 }}
->>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
           </template>
         </el-table-column>
         <el-table-column label="物料名称" align="center" min-width="150">
@@ -237,37 +205,17 @@
         </el-table-column>
         <el-table-column label="数量" align="center" min-width="100">
           <template slot-scope="scope">
-<<<<<<< HEAD
             <el-input v-model="scope.row.数量" size="mini" style="width:70px" @change="updateNumber(scope.row)"/>
-=======
-            <el-input v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:70px"/>
-            <b v-else>{{ scope.row.数量 }}</b>
-          </template>
-        </el-table-column>
-        <el-table-column label="单位" align="center" min-width="60">
-          <template slot-scope="scope">
-            {{ scope.row.计量单位 }}
->>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" min-width="150" prop="备注">
           <template slot-scope="scope">
-<<<<<<< HEAD
             <el-input v-model="scope.row.备注" size="mini" style="width:120px" @change="updateNumber(scope.row)"/>
-=======
-            <el-input v-direction="{x: 3, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.备注" :disabled="disable" size="mini" style="width:120px"/>
-            <b v-else>{{ scope.row.备注 || '—' }}</b>
->>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="100">
           <template slot-scope="scope">
-<<<<<<< HEAD
             <el-button type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
-=======
-            <el-button v-if="quickChangePrice" :disabled="disable" type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
-            <b v-else>移除</b>
->>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
           </template>
         </el-table-column>
       </el-table>
@@ -385,7 +333,6 @@ export default {
           this.dialogVisible = false
         }
       })
-<<<<<<< HEAD
     },
     cancelEdit1(row) { // 取消设置
       row.安全库存量 = row.原安全库存量
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 3d1175d8..e25ae23e 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -77,24 +77,18 @@
               <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
               <span>物料型号:</span>
               <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
-            </el-row>
-            <el-row style="margin-bottom: 10px">
-              <span class="demonstration">开始时间: </span>
+              <span style="margin-left: 10px">时间段:</span>
               <el-date-picker
                 v-model="startTime"
-                value-format="yyyy-MM-dd"
                 size="small"
-                style="width: 200px"
-                type="date"
-                placeholder="选择日期"/>
-              <span class="demonstration">结束时间:</span>
-              <el-date-picker
-                v-model="endTime"
+                type="daterange"
+                align="center"
                 value-format="yyyy-MM-dd"
-                size="small"
-                style="width: 200px"
-                type="date"
-                placeholder="选择日期"/>
+                format="yyyy-MM-dd"
+                range-separator="～"
+                style="width:250px"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"/>
               <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent11=1;pageSize11=100;total11=0;searchTable11()">查询</el-button>
               <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价物料清单</el-button>
               <el-popover v-model="visible" title="调整采购任务" placement="top" width="180">
@@ -296,6 +290,18 @@
               <el-input v-model="partName" placeholder="零件名称" size="small" clearable/>
               <span>零件规格:</span>
               <el-input v-model="partSpec" placeholder="零件规格" size="small" clearable/>
+              <span style="margin-left: 10px">时间段:</span>
+              <el-date-picker
+                v-model="endTime"
+                size="small"
+                type="daterange"
+                align="center"
+                value-format="yyyy-MM-dd"
+                format="yyyy-MM-dd"
+                range-separator="～"
+                style="width:250px"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"/>
               <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent12=1;pageSize12=100;total12=0;searchTable12()">查询</el-button>
               <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价物料清单</el-button>
               <el-popover v-model="visible2" title="调整采购任务" placement="top" width="180">
@@ -1515,8 +1521,8 @@ export default {
       this.projectValue ? check4 = 1 : check4 = 0
       this.machineValue ? check5 = 1 : check5 = 0
       this.groupValue ? check6 = 1 : check6 = 0
-      this.startTime && this.endTime ? check7 = 1 : check7 = 0
-      searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2, check7, this.startTime, this.endTime).then(response => {
+      this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
+      searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2, check7, this.startTime[0], this.startTime[1]).then(response => {
         this.tableData11 = response.data.rows
         this.total11 = response.data.total
         const remark = []
@@ -1547,14 +1553,15 @@ export default {
       this.searchTable11()
     },
     searchTable12() { // 查询基本件列表
-      let check1, check2, check3, check4, check5, check6
+      let check1, check2, check3, check4, check5, check6, check7
       this.partNum ? check1 = 1 : check1 = 0
       this.partName ? check2 = 1 : check2 = 0
       this.partSpec ? check3 = 1 : check3 = 0
       this.projectValue ? check4 = 1 : check4 = 0
       this.machineValue ? check5 = 1 : check5 = 0
       this.groupValue ? check6 = 1 : check6 = 0
-      searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue).then(response => {
+      this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '')
+      searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => {
         this.tableData12 = response.data.rows
         this.total12 = response.data.total
         const remark = []