From b62e2616baeed2feadd8a403ede33f20320e4dd4 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Mon, 30 Sep 2019 15:00:57 +0800
Subject: [PATCH] xqs

---
 .../PurchasingCenter/CreateInquirySheet.js    |   2 +-
 src/icons/svg/ProcurementInquiry.svg          |   1 +
 src/utils/request.js                          |   2 +-
 .../CreateInquirySheet/index.vue              |   6 +
 .../PurchaseTaskAllocate/index.vue            | 125 ++++++++++--------
 5 files changed, 77 insertions(+), 59 deletions(-)
 create mode 100644 src/icons/svg/ProcurementInquiry.svg

diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js
index 8505ae2b..8cedc41c 100644
--- a/src/api/PurchasingCenter/CreateInquirySheet.js
+++ b/src/api/PurchasingCenter/CreateInquirySheet.js
@@ -82,7 +82,7 @@ export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_采购部采购_查询物料_分配后',
+      name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存',
       param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}`,
       Pagination: pageCurrent + '&' + pageSize
     }
diff --git a/src/icons/svg/ProcurementInquiry.svg b/src/icons/svg/ProcurementInquiry.svg
new file mode 100644
index 00000000..60fcb677
--- /dev/null
+++ b/src/icons/svg/ProcurementInquiry.svg
@@ -0,0 +1 @@
+<svg class="icon" viewBox="0 0 1045 1024" xmlns="http://www.w3.org/2000/svg" width="204.102" height="200"><defs><style/></defs><path d="M229.836 177.192h461.986v57.748H229.836v-57.748zm-1.54 116.063h461.986v57.748H228.297v-57.748zm-113.955-232.5h692.977v461.984h57.748V60.754c0-31.893-25.855-57.748-57.748-57.748H114.34c-31.893 0-57.748 25.855-57.748 57.748v808.473c0 31.893 25.855 57.748 57.748 57.748h404.237v-57.748H114.34V60.754zm115.11 463.486v57.748h140.453c0-20.068 2.94-39.447 8.386-57.748H229.451zm236.111-115.496H228.297v57.748H403.84a203.177 203.177 0 0 1 61.722-57.748zm437.246 464.777L770.39 742.678c30.444-35.382 48.852-81.417 48.852-131.754 0-111.627-90.493-202.119-202.117-202.119-111.626 0-202.118 90.492-202.118 202.119 0 111.624 90.492 202.118 202.118 202.118 40.412 0 78.05-11.867 109.63-32.299l135.218 133.614c11.276 11.276 29.558 11.276 40.834 0 11.274-11.277 11.274-29.558 0-40.835zM472.754 610.924c0-79.734 64.639-144.37 144.372-144.37 79.731 0 144.369 64.636 144.369 144.37 0 79.731-64.638 144.37-144.37 144.37s-144.37-64.639-144.37-144.37z"/></svg>
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 400de537..92890169 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,7 +23,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://localhost:8005/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.102:8005/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 34f4f5ca..022bd445 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -179,6 +179,11 @@
                     {{ scope.row.待询价数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
                   </template>
                 </el-table-column>
+                <el-table-column label="库存数" align="center" min-width="90">
+                  <template slot-scope="scope">
+                    {{ Number(scope.row.货位存量) }}
+                  </template>
+                </el-table-column>
                 <el-table-column label="使用滞货数量" align="center" min-width="100">
                   <template slot-scope="scope">
                     {{ Number(scope.row.使用滞货数量) }}
@@ -1413,6 +1418,7 @@ export default {
       this.groupValue ? check6 = 1 : check6 = 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).then(response => {
         this.tableData11 = response.data.rows
+        console.log(response.data.rows)
         this.total11 = response.data.total
         const remark = []
         const supplier = []
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index 86876b4a..1edcb51b 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -41,7 +41,15 @@
               <b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
             </el-option>
           </el-select>
-          <span>时间段:</span>
+          <span style="margin-left: 5px">组号:</span>
+          <el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable width="100px">
+            <el-option
+              v-for="item in group"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <span style="margin-left: 10px">时间段:</span>
           <el-date-picker
             v-model="dateRange"
             :picker-options="pickerOptions"
@@ -51,15 +59,38 @@
             value-format="yyyy-MM-dd"
             format="yyyy-MM-dd"
             range-separator="～"
-            style="width:300px"
+            style="width:250px"
             start-placeholder="开始日期"
             end-placeholder="结束日期"/>
-          <el-button
-            type="success"
+        </el-row>
+        <el-row style="margin-bottom: 5px">
+          <span>物料状态:</span>
+          <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" width="100px" style="margin-top: 5px"/>
+          <span style="margin-left: 0">物料类别:</span>
+          <el-select
+            v-model="MaterialCategoryValue"
+            placeholder="请选择物料类别"
             size="small"
-            icon="el-icon-search"
-            style="margin-left: 10px;"
-            @click="pageCurrent0=1;pageSize0=20;total0=0;searchTable0()">查询</el-button>
+            clearable
+            @change="searchMaterialVariety">
+            <el-option
+              v-for="item in MaterialCategory"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <span>物料品种:</span>
+          <el-select
+            v-model="MaterialVarietyValue"
+            placeholder="请选择物料品种"
+            size="small"
+            clearable>
+            <el-option
+              v-for="item in MaterialVariety"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
           <div style="float:right;">
             <span style="margin-left: 0">采购员:</span>
             <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
@@ -71,18 +102,20 @@
             </el-select>
           </div>
         </el-row>
-        <el-row style="margin-bottom: 5px">
-          <span style="margin-left: 0">组&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号:</span>
-          <el-select v-model="groupValue" placeholder="组号" size="small" filterable clearable>
-            <el-option
-              v-for="item in group"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <span style="margin-right: -10px">物料状态:</span>
-          <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin-left: 10px"/>
-          <div style="float:right;padding-top:10px;">
+        <el-row style="margin-bottom: 10px">
+          <span style="margin-left: 0">物料名称:</span>
+          <el-input v-model="materialName" placeholder="请选择物料名称" size="small" style="margin-top: 5px" clearable/>
+          <span>物料规格:</span>
+          <el-input v-model="materialSpec" placeholder="请选择物料规格" size="small" clearable/>
+          <span>物料型号:</span>
+          <el-input v-model="materialModel" placeholder="请选择物料型号" size="small" clearable/>
+          <el-button
+            type="success"
+            size="small"
+            icon="el-icon-search"
+            style="margin-left: 10px;"
+            @click="pageCurrent0=1;pageSize0=20;total0=0;searchTable0()">查询</el-button>
+          <div style="float:right;padding-top:5px;">
             <el-tooltip :open-delay="1000" effect="dark" content="选择采购员后，将物料分配给所选的采购员" placement="top">
               <el-button
                 type="primary"
@@ -101,41 +134,6 @@
             </el-tooltip>
           </div>
         </el-row>
-        <el-row style="margin-bottom: 15px">
-          <span style="margin-left: 0">物料类别:</span>
-          <el-select
-            v-model="MaterialCategoryValue"
-            placeholder="请选择"
-            size="small"
-            clearable
-            @change="searchMaterialVariety">
-            <el-option
-              v-for="item in MaterialCategory"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <span>物料品种:</span>
-          <el-select
-            v-model="MaterialVarietyValue"
-            placeholder="请选择"
-            size="small"
-            clearable>
-            <el-option
-              v-for="item in MaterialVariety"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-        </el-row>
-        <el-row style="margin-bottom: 15px">
-          <span style="margin-left: 0">物料名称:</span>
-          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
-          <span>物料规格:</span>
-          <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">
           <el-table v-loading="" :data="tableData0" size="mini" style="max-height: 600px" height="500px" border stripe @selection-change="handleSelectionChange1">
             <el-table-column :selectable="selectable" align="center" type="selection"/>
@@ -688,6 +686,14 @@ export default {
             start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
             picker.$emit('pick', [start, end])
           }
+        }, {
+          text: '近一年',
+          onClick(picker) {
+            const end = new Date()
+            const start = new Date()
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 365)
+            picker.$emit('pick', [start, end])
+          }
         }]
       },
       dateRange: '',
@@ -786,11 +792,19 @@ export default {
     this.fetchData() // 初始化数据
     this.searchUnallocatePartNumber()
     this.timer2 = setInterval(this.searchUnallocatePartNumber, 20 * 60 * 1000) // 20 分钟一刷新
+    this.getDefaultTime()
   },
   beforeDestroy() {
     clearInterval(this.timer2)
   },
   methods: {
+    getDefaultTime() {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+      end.getTime(start.getTime())
+      this.dateRange = [start, end]
+    },
     // 选择机床
     clickCard(project, machine) {
       this.projectValue = project
@@ -1133,9 +1147,6 @@ export default {
   .el-input{
     width:200px
   }
-  span{
-    margin: 10px 0 10px 10px;
-  }
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>
   .item {