From 2cc8ce5025721d7d7de16c837faaa846ecd68388 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 9 Nov 2019 13:52:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=90=88=E5=90=8C=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/PurchasingCenter/OfflineContract.js   | 12 +--
 src/utils/request.js                          |  2 +-
 .../OfflineContract/index.vue                 | 80 ++++++-------------
 3 files changed, 33 insertions(+), 61 deletions(-)

diff --git a/src/api/PurchasingCenter/OfflineContract.js b/src/api/PurchasingCenter/OfflineContract.js
index c1bef1f6..009a1eae 100644
--- a/src/api/PurchasingCenter/OfflineContract.js
+++ b/src/api/PurchasingCenter/OfflineContract.js
@@ -208,14 +208,14 @@ export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2
   })
 }
 // 查询分配后的标准件和外购件
-export function searchMaterial1(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7, val8, val9, val10) {
+export function searchMaterial1(pageCurrent, pageSize, check1, val1, person, check5, val5, val8, val9, val10) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存_New20191108',
-      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}`,
+      name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存_New20191109',
+      param: `名称规格型号_check=${check1}&名称规格型号=${val1}&人员编号=${person}&机床流水号_check=${check5}&机床流水号=${val5}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -234,14 +234,14 @@ export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, va
   })
 }
 // 查询物料
-export function searchMaterial22(check1, val1, check2, val2, check3, val3, pageCurrent, pageSize) {
+export function searchMaterial22(check1, val1, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '采购管理_离线采购_物料主文件_基本_查询数据',
-      param: `物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}`,
+      param: `名称规格型号_check=${check1}&名称规格型号=${val1}`,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -265,7 +265,7 @@ export function searchMachine(num) {
     data: {
       type: '1',
       name: 'PDM_机床名称_查询数据',
-      param: '项目流水号_check=1&项目流水号=' + num
+      param: '项目流水号_check=0&项目流水号=' + num
     }
   })
 }
diff --git a/src/utils/request.js b/src/utils/request.js
index 2cb92ad8..fc41e22d 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.0.110:8002/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index b5c9b39a..d77b9660 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -5,34 +5,14 @@
         <el-tabs v-model="tabName" type="border-card" @tab-click="tabClick">
           <el-tab-pane label="三表" name="标准件">
             <el-row>
-              <el-select v-model="projectValue" style="width:120px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
-                <el-option
-                  v-for="item in project"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-              <el-select v-model="machineValue" style="width:120px;margin-left: 10px" placeholder="机床图号" size="small" clearable filterable @change="machineChange">
+              <el-input v-model="materialName" style="width: 150px;margin-left: 5px" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()"/>
+              <el-select v-model="machineValue" style="width:150px;margin-left: 5px" placeholder="机床图号" size="small" clearable filterable @change="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">
                 <el-option
                   v-for="item in machine"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"/>
               </el-select>
-              <el-select v-model="groupValue" style="width:120px;margin-left: 10px" placeholder="组号" size="small" clearable filterable>
-                <el-option
-                  v-for="item in group"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-              <el-input v-model="materialName" style="width: 120px;margin-left: 10px" placeholder="物料名称" size="small" clearable/>
-              <el-input v-model="materialSpec" style="width: 120px;margin-left: 10px" placeholder="物料规格" size="small" clearable/>
-              <el-input v-model="materialModel" style="width: 120px;margin-left: 10px" placeholder="物料型号" size="small" clearable/>
-              <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="width: 120px; margin: 0px 10px"/>
-            </el-row>
-            <el-row>
-              <!--<span>物料状态:</span>-->
               <el-date-picker
                 v-model="startTime"
                 size="small"
@@ -41,13 +21,13 @@
                 value-format="yyyy-MM-dd"
                 format="yyyy-MM-dd"
                 range-separator="～"
-                style="width:250px;margin-left: 0px"
+                style="width:250px;margin-left: 5px"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"/>
-              <el-button type="success" size="small" icon="el-icon-search" style="margin:10px 10px 0px 10px" @click="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">查询</el-button>
+              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">查询</el-button>
               <el-popover v-model="visible1" placement="top" width="140">
                 <div style="text-align: right; margin: 0">
-                  <el-select v-model="PersonValue" style="width:100px;margin: 10px 0px" placeholder="人员" size="small" filterable clearable>
+                  <el-select v-model="PersonValue" style="width:100px" placeholder="人员" size="small" filterable clearable>
                     <el-option
                       v-for="item in Person"
                       :key="item.value"
@@ -76,6 +56,21 @@
                   <el-tag v-if="parseInt(scope.row.询价状态编号)!==1&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
                 </template>
               </el-table-column>
+              <el-table-column label="名称" align="center" prop="物料名称" min-width="100" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.物料名称 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="规格" align="center" prop="物料规格" min-width="120" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.物料规格 }}
+                </template>
+              </el-table-column>
+              <el-table-column label="型号" prop="物料型号" align="center" min-width="100" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  {{ scope.row.物料型号 }}
+                </template>
+              </el-table-column>
               <el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" min-width="120" show-overflow-tooltip>
                 <template slot-scope="scope">
                   {{ scope.row.供货商 === '0' ? '-' : scope.row.供货商 }}
@@ -101,21 +96,6 @@
                   {{ scope.row.物料品种 }}
                 </template>
               </el-table-column>
-              <el-table-column label="名称" align="center" prop="物料名称" min-width="100" show-overflow-tooltip>
-                <template slot-scope="scope">
-                  {{ scope.row.物料名称 }}
-                </template>
-              </el-table-column>
-              <el-table-column label="图号或型号" prop="物料型号" align="center" min-width="100" show-overflow-tooltip>
-                <template slot-scope="scope">
-                  {{ scope.row.物料型号 }}
-                </template>
-              </el-table-column>
-              <el-table-column label="规格" align="center" prop="物料规格" min-width="120" show-overflow-tooltip>
-                <template slot-scope="scope">
-                  {{ scope.row.物料规格 }}
-                </template>
-              </el-table-column>
               <el-table-column label="分配数量" align="center" min-width="70" prop="零件数量">
                 <template slot-scope="scope">
                   {{ scope.row.零件数量 }}
@@ -185,9 +165,7 @@
           </el-tab-pane>
           <el-tab-pane label="仓库" name="仓库">
             <el-row style="margin-bottom: 10px">
-              <el-input v-model="materialName" style="width: 120px;margin-left: 10px" placeholder="物料名称" size="small" clearable/>
-              <el-input v-model="materialSpec" style="width: 120px;margin-left: 10px" placeholder="物料规格" size="small" clearable/>
-              <el-input v-model="materialModel" style="width: 120px;margin-left: 10px" placeholder="物料型号" size="small" clearable/>
+              <el-input v-model="materialName" style="width: 150px;margin-left: 10px" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent11=1;pageSize11=20;total11=0;searchTable22()"/>
               <!--<span>物料状态:</span>-->
               <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="width: 120px;margin: 0px"/>-->
               <!--<el-date-picker-->
@@ -881,7 +859,7 @@ export default {
   },
   created() {
     this.getPerson()
-    this.fetchData()
+    this.projectChange()
     // this.searchTable2()
     this.searchTable11()
     this.initDirection()
@@ -1574,17 +1552,13 @@ export default {
       return Number(row.采购状态编号) < 3 && Number(row.是否确认) === 1 // 未采购&&确认物料修改
     },
     searchTable11() { // 查询外购件列表
-      let check1, check2, check3, check4, check5, check6, check7
+      let check1, check5, check7
       this.materialName ? check1 = 1 : check1 = 0
-      this.materialSpec ? check2 = 1 : check2 = 0
-      this.materialModel ? check3 = 1 : check3 = 0
-      this.projectValue ? check4 = 1 : check4 = 0
       this.machineValue ? check5 = 1 : check5 = 0
-      this.groupValue ? check6 = 1 : check6 = 0
       this.startTime ? check7 = 1 : (check7 = 0, this.startTime = '')
       if (this.tabName === '外购件') { this.partType = 2 }
       if (this.tabName === '标准件') { this.partType = 1 }
-      searchMaterial1(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, this.partType, check7, this.startTime[0], this.startTime[1]).then(response => {
+      searchMaterial1(this.pageCurrent11, this.pageSize11, check1, this.materialName, this.id, check5, this.machineValue, check7, this.startTime[0], this.startTime[1]).then(response => {
         console.log(response.data, 111222)
         this.tableData00 = response.data.rows
         this.total11 = response.data.total
@@ -1653,11 +1627,9 @@ export default {
       this.searchTable12()
     },
     searchTable22() {
-      let check1, check2, check3
+      let check1
       this.materialName ? check1 = 1 : check1 = 0
-      this.materialSpec ? check2 = 1 : check2 = 0
-      this.materialModel ? check3 = 1 : check3 = 0
-      searchMaterial22(check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.pageCurrent22, this.pageSize22).then(response => {
+      searchMaterial22(check1, this.materialName, this.pageCurrent22, this.pageSize22).then(response => {
         console.log(response.data, 3333)
         this.tableData22 = response.data.rows
         this.total22 = response.data.total