From 82730e6baa1f3088905890d24c24891d3920f399 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Mon, 18 Mar 2019 08:29:23 +0800
Subject: [PATCH 1/8] bugfix

---
 .../MarketingCenter/ContractInformationManagement/index.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index cc878508..fbb4666a 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -467,7 +467,7 @@
     </el-dialog>
 
     <!--客户选择-->
-    <el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="600px">
+    <el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="60%">
       <el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 10;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
       <el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" show-overflow-tooltip style="height: 330px; margin-top: 20px" @row-click="handleCustomerChange">

From f85ecfdbaeb127fefe756767bc3e1b15b36ba9ac Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Tue, 26 Mar 2019 16:59:06 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Inventory/StockInquiry.js             |  37 ++++
 src/icons/svg/StockInquiry.svg                |   1 +
 src/views/Inventory/StockInquiry/index.vue    | 165 ++++++++++++++++++
 .../ContractInformationManagement/index.vue   |  88 +++++-----
 4 files changed, 248 insertions(+), 43 deletions(-)
 create mode 100644 src/api/Inventory/StockInquiry.js
 create mode 100644 src/icons/svg/StockInquiry.svg
 create mode 100644 src/views/Inventory/StockInquiry/index.vue

diff --git a/src/api/Inventory/StockInquiry.js b/src/api/Inventory/StockInquiry.js
new file mode 100644
index 00000000..2104299f
--- /dev/null
+++ b/src/api/Inventory/StockInquiry.js
@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+// 初始化项目
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_查询数据_按时间排序'
+    }
+  })
+}
+// 机床查询
+export function searchmachine(check, num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_查询数据',
+      param: '项目流水号_check=' + check + '=int&项目流水号=' + num
+    }
+  })
+}
+// 分组查询
+export function searchTeam(machineNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_组件名称_查询数据',
+      param: '机床流水号=' + machineNumber
+    }
+  })
+}
diff --git a/src/icons/svg/StockInquiry.svg b/src/icons/svg/StockInquiry.svg
new file mode 100644
index 00000000..343a5d73
--- /dev/null
+++ b/src/icons/svg/StockInquiry.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1553579626916" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2009" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M65.344 944.64l893.312 0 0 72.064-893.312 0 0-72.064Z" p-id="2010"></path><path d="M838.016 40 185.984 40c-70.656 0-128 57.344-128 128l0 531.968c0 70.656 57.344 128 128 128l652.032 0c70.656 0 128-57.344 128-128L966.016 168C966.016 97.344 908.672 40 838.016 40zM832 486.656l-60.032 0 0 193.344L254.976 680 256 486.656 192 486.656 192 416l325.312-275.968L832 428.032 832 486.656z" p-id="2011"></path><path d="M512 266.304 316.032 436.288 316.032 620.352 446.72 620.352 446.72 494.976 577.344 494.976 577.344 620.352 707.968 620.352 707.968 436.288Z" p-id="2012"></path></svg>
\ No newline at end of file
diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue
new file mode 100644
index 00000000..56693e1c
--- /dev/null
+++ b/src/views/Inventory/StockInquiry/index.vue
@@ -0,0 +1,165 @@
+<template>
+  <div>
+    <el-card>
+      <span>项目名称:</span>
+      <el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine">
+        <el-option
+          v-for="item in Project"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span>机床图号:</span>
+      <el-select v-model="MachineValue" filterable clearable size="small" placeholder="机床图号" style="width: 200px;margin-right:10px" @change="searchGroupList">
+        <el-option
+          v-for="item in Machine"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span>组号:</span>
+      <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 200px;margin-right:10px">
+        <el-option
+          v-for="item in GroupNum"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span>零件图号:</span>
+      <el-input v-model="Partpaint" clearable size="small" style="width:200px;margin-right:10px" />
+      <span>库位:</span>
+      <el-select v-model="StoreHouseValue" filterable clearable size="small" placeholder="组号" style="width: 200px;margin-right:10px">
+        <el-option
+          v-for="item in StoreHouse"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="">查询</el-button>
+    </el-card>
+
+    <el-card>
+      <el-table
+        v-loading="listLoadingx1"
+        :data="HouseDataBasic"
+        border
+        size="mini"
+        style="width: 100%;"
+        height="200">
+        <el-table-column
+          label="序号"
+          align="center"
+          type="index"
+          width="50"/>
+        <el-table-column label="入库时间" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.入库时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="库位" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.货位名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件名称" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.物料名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件图号" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="项目名称" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.项目名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床图号" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="组号" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.组号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件数量" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.货位存量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件类型" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.类型名称 }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+  import { initProject, searchmachine, searchTeam } from '@/api/Inventory/StockInquiry'
+  export default {
+    data() {
+      return {
+        ProjectValue: '',
+        Project: [],
+        ProjectValue_check: 1,
+        MachineValue: '',
+        Machine: [],
+        MachineValue_check: 1,
+        GroupNumValue: '',
+        GroupNumValue_check: 1,
+        GroupNum: [],
+        Partpaint: '',
+        StoreHouseValue: '',
+        StoreHouse: [],
+        HouseDataBasic: [],
+      }
+    },
+    created(){
+      this.fetchData()
+    },
+    methods: {
+      fetchData() {
+        this.getSelect(initProject, ['项目名称', '项目流水号'], 'Project') // 项目名称
+      },
+      searchMachine() { // 查询机床
+        this.Machine = []
+        this.GroupNum = []
+        this.MachineValue = ''
+        this.GroupNumValue = ''
+        if (this.ProjectValue !== '') {
+          searchmachine(1, this.ProjectValue).then(response => {
+            for (let i = 0; i < response.data.length; i++) {
+              this.Machine.push({
+                label: response.data[i].机床图号,
+                value: response.data[i].机床流水号
+              })
+            }
+          })
+        }
+      },
+      searchGroupList() { // 查询组号
+        this.GroupNum = []
+        this.GroupNumValue = ''
+        searchTeam(this.MachineValue).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.GroupNum.push({
+              label: response.data[i].组号,
+              value: response.data[i].组件流水号
+            })
+          }
+        })
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index fbb4666a..cc01a875 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -1,36 +1,40 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>项目名称：</span>
-      <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-right: 10px" size="small">
-        <el-option
-          v-for="item in entryName"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span style="margin-left: 10px">机床型号：</span>
-      <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
-      <span style="margin-left: 10px">销售经理：</span>
-      <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
-      <span style="margin-left: 10px">时间区间：</span>
-      <el-date-picker
-        v-model="startTime"
-        style="width: 200px;"
-        value-format="yyyy-MM-dd"
-        size="small"
-        type="date"
-        placeholder="请选择开始日期"/>
-      <span>-</span>
-      <el-date-picker
-        v-model="endTime"
-        style="width: 200px;"
-        value-format="yyyy-MM-dd"
-        size="small"
-        type="date"
-        placeholder="请选择结束日期"/>
-      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
-      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">增加</el-button>
+      <div>
+        <span>项目名称：</span>
+        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small">
+          <el-option
+            v-for="item in entryName"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span style="margin-left: 10px">机床型号：</span>
+        <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
+        <span style="margin-left: 10px">销售经理：</span>
+        <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
+      </div>
+      <div style="margin-top: 20px">
+        <span style="margin-top: 20px">开始日期：</span>
+        <el-date-picker
+          v-model="startTime"
+          style="width: 200px;"
+          value-format="yyyy-MM-dd"
+          size="small"
+          type="date"
+          placeholder="请选择开始日期"/>
+        <span style="margin-left: 10px">结束日期：</span>
+        <el-date-picker
+          v-model="endTime"
+          style="width: 200px;"
+          value-format="yyyy-MM-dd"
+          size="small"
+          type="date"
+          placeholder="请选择结束日期"/>
+        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
+        <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">增加</el-button>
+      </div>
     </el-card>
     <el-card>
       <el-table
@@ -46,18 +50,18 @@
         @expand-change="selectMachine">
         <el-table-column type="expand">
           <template slot-scope="scope">
-            <el-table :data="tableData2" border style="width: 600px; text-align: center" size="mini">
-              <el-table-column label="设备型号" align="center">
+            <el-table :data="tableData2" border style="width: 490px; text-align: center" size="mini">
+              <el-table-column label="设备型号" align="center" width="130">
                 <template slot-scope="scope">
                   {{ scope.row.机床图号 }}
                 </template>
               </el-table-column>
-              <el-table-column label="设备名称" align="center">
+              <el-table-column label="设备名称" align="center" width="160">
                 <template slot-scope="scope">
                   {{ scope.row.机床名称 }}
                 </template>
               </el-table-column>
-              <el-table-column label="操作" fixed="right" width="200px" align="center">
+              <el-table-column label="操作" width="200" align="center">
                 <template slot-scope="scope">
                   <el-button
                     size="mini"
@@ -100,7 +104,7 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="付款方式" width="150">
+        <el-table-column align="center" label="付款方式" width="80">
           <template slot-scope="scope">
             {{ scope.row.付款方式 }}
           </template>
@@ -360,7 +364,7 @@
     </el-dialog>
 
     <!--新增机床对话框-->
-    <el-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="25%">
+    <el-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="140px">
         <el-form-item label="设备型号" prop="设备型号">
           <el-input v-model="form1.设备型号" size="small" placeholder="请输入设备型号" style="width:200px"/>
@@ -376,8 +380,8 @@
     </el-dialog>
 
     <!--营销经理选择-->
-    <el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="30%">
-      <span>责权省份</span>
+    <el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
+      <span>责权省份：</span>
       <el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">
         <el-option
           v-for="item in Province"
@@ -467,7 +471,7 @@
     </el-dialog>
 
     <!--客户选择-->
-    <el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="60%">
+    <el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="800px">
       <el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 10;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
       <el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" show-overflow-tooltip style="height: 330px; margin-top: 20px" @row-click="handleCustomerChange">
@@ -507,7 +511,7 @@
     </el-dialog>
 
     <!--改变节点时间对话框-->
-    <el-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="进度完成时间" center style="min-height: 300px" width="23%">
+    <el-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="进度完成时间" center style="min-height: 300px" width="400px">
       <el-form ref="form2" :model="form2" :rules="rules2" :disabled="disabledTime" label-width="140px">
         <el-form-item label="进度完成日期" prop="进度完成日期">
           <el-date-picker
@@ -1228,9 +1232,7 @@ export default {
 </script>
 
 <style scoped>
-.el-card {
-  margin-top: 15px;
-}
+
 .el-date-editor{
   width:200px;
 }

From e567e52a2aaeaa62f30fdbef0abd8a332f052650 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 26 Mar 2019 16:59:56 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../machiningHoursStatistics.js               |  6 ++---
 .../machiningHoursStatistics/index.vue        | 27 +++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/api/ManufacturingCenter/machiningHoursStatistics.js b/src/api/ManufacturingCenter/machiningHoursStatistics.js
index 749c2705..444da7f9 100644
--- a/src/api/ManufacturingCenter/machiningHoursStatistics.js
+++ b/src/api/ManufacturingCenter/machiningHoursStatistics.js
@@ -7,8 +7,8 @@ export function searchtable(num1, num2, num3, num4, num5, pageCurrent, pageSize)
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_工时统计_查询数据',
-      param: '操作者_check=' + num1 + '&操作者=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5,
+      name: '车间生产管理工艺_工时统计_查询数据2',
+      param: '操作者_check=' + num1 + '&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -20,7 +20,7 @@ export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_工时统计按人员查询_查询数据',
+      name: '车间生产管理工艺_工时统计按人员查询_查询数据2',
       param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4,
       Pagination: pageCurrent + '&' + pageSize
     }
diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
index ea29520e..15622569 100644
--- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
@@ -34,12 +34,12 @@
             width="50"/>
           <el-table-column label="操作者" align="center" width="150px">
             <template slot-scope="scope">
-              {{ scope.row.操作者 }}
+              {{ scope.row.姓名 }}
             </template>
           </el-table-column>
-          <el-table-column label="总工时" align="center">
+          <el-table-column label="实际工时" align="center">
             <template slot-scope="scope">
-              {{ scope.row.工人总工时 }}
+              {{ scope.row.实际加工时间段 }}
             </template>
           </el-table-column>
         </el-table>
@@ -76,14 +76,19 @@
               {{ scope.row.工艺名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="工序工时" align="center" width="150px">
+          <el-table-column label="理论工时" align="center" width="150px">
             <template slot-scope="scope">
-              {{ scope.row.工序工时 }}
+              {{ scope.row.理论加工时间段 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="实际工时" align="center" width="150px">
+            <template slot-scope="scope">
+              {{ scope.row.实际加工时间段 }}
             </template>
           </el-table-column>
           <el-table-column label="完成日期" align="center">
             <template slot-scope="scope">
-              {{ scope.row.完成日期 }}
+              {{ scope.row.加工完成时间 }}
             </template>
           </el-table-column>
         </el-table>
@@ -160,14 +165,11 @@ export default {
       this.loading2 = true
       this.tableData2 = []
       this.pageCurrent2 = 1
-      this.gongzuozhebianhao = row.工作者编号
-      searchtable2(row.工作者编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => {
+      this.gongzuozhebianhao = row.人员编号
+      searchtable2(row.人员编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => {
         if (response.data.total === 0) {
           this.loading2 = false
         } else {
-          for (let i = 0; i < response.data.rows.length; i++) {
-            response.data.rows[i].完成日期 = response.data.rows[i].完成日期.split(' ')[0]
-          }
           this.total2 = response.data.total
           this.tableData2 = response.data.rows
         }
@@ -182,9 +184,6 @@ export default {
         if (response.data.total === 0) {
           this.loading2 = false
         } else {
-          for (let i = 0; i < response.data.rows.length; i++) {
-            response.data.rows[i].完成日期 = response.data.rows[i].完成日期.split(' ')[0]
-          }
           this.total2 = response.data.total
           this.tableData2 = response.data.rows
         }

From 8266a64bbe68f7972c28d609feedbf9feeefa817 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 26 Mar 2019 17:07:13 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../machiningHoursStatistics/index.vue             | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
index 15622569..177c52bf 100644
--- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
@@ -25,14 +25,14 @@
       </el-row>
     </el-card>
     <el-card>
-      <el-col :span="7">
+      <el-col :span="6">
         <el-table v-loading="loading" :data="tableData" highlight-current-row height="580" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
           <el-table-column
             label=" "
             type="index"
             align="center"
             width="50"/>
-          <el-table-column label="操作者" align="center" width="150px">
+          <el-table-column label="操作者" align="center" width="130px">
             <template slot-scope="scope">
               {{ scope.row.姓名 }}
             </template>
@@ -54,7 +54,7 @@
             @current-change="handleCurrentChange"/>
         </div>
       </el-col>
-      <el-col :span="16" style="margin-left: 30px;">
+      <el-col :span="17" style="margin-left: 30px;">
         <el-table v-loading="loading2" :data="tableData2" height="580" style="width: 100%;" border element-loading-text="拼命加载中">
           <el-table-column
             label=" "
@@ -71,22 +71,22 @@
               {{ scope.row.零件名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="工艺名称" align="center" width="150px">
+          <el-table-column label="工艺名称" align="center" width="130px">
             <template slot-scope="scope">
               {{ scope.row.工艺名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="理论工时" align="center" width="150px">
+          <el-table-column label="理论工时" align="center" width="100px">
             <template slot-scope="scope">
               {{ scope.row.理论加工时间段 }}
             </template>
           </el-table-column>
-          <el-table-column label="实际工时" align="center" width="150px">
+          <el-table-column label="实际工时" align="center" width="100px">
             <template slot-scope="scope">
               {{ scope.row.实际加工时间段 }}
             </template>
           </el-table-column>
-          <el-table-column label="完成日期" align="center">
+          <el-table-column label="完成时间" align="center">
             <template slot-scope="scope">
               {{ scope.row.加工完成时间 }}
             </template>

From f94d46abc229ceab5f98382a440fa03757b8b7e8 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Tue, 26 Mar 2019 18:10:48 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E8=BE=B9=E6=A1=86=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/element-ui.scss                            | 11 +++++++++++
 src/views/MarketingCenter/CRM/index.vue               | 10 +++++++---
 .../ContractCapitalManagement/index.vue               |  9 +++++++--
 .../ContractInformationManagement/index.vue           |  7 ++++++-
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index ef7bb5da..46dca356 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -27,3 +27,14 @@
     }
   }
 }
+ .el-table td, .el-table th.is-leaf{
+   border-bottom: 1px solid DarkGray;
+   border-left: 1px solid DarkGray;
+   border-top: 1px solid DarkGray;
+   border-right: 1px solid DarkGray;
+ }
+ .el-textarea__inner,
+ .el-radio__inner,
+ .el-input__inner{
+   border: 1px solid rgb(49, 56, 72)!important;
+ }
diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index c0506572..b6ddc1b5 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -24,7 +24,7 @@
       <el-button type="success" icon="el-icon-search" class="move" size="small" @click="selectCustomerOfName">查询</el-button>
     </el-card>
     <el-row>
-      <el-col :span="4">
+      <el-col :span="6">
         <el-card>
           <el-table
             v-loading="loading1"
@@ -48,7 +48,7 @@
           </el-table>
         </el-card>
       </el-col>
-      <el-col :span="20">
+      <el-col :span="18">
         <el-card>
           <el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click="addMarketingManager();flag = 1">添加销售经理</el-button>
           <span style="float: right">销售经理</span>
@@ -586,5 +586,9 @@ export default {
   .move{
     margin-left: 10px;
   }
-
+  .el-table td, .el-table th.is-leaf,
+  .el-radio__inner,
+  .el-input__inner{
+    border: 1px solid black!important;
+  }
 </style>
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index b3758cbc..c2ee328e 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -380,8 +380,8 @@
       </div>
     </el-dialog>
     <!--营销经理选择-->
-    <el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="30%">
-      <span>责权省份</span>
+    <el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
+      <span>责权省份：</span>
       <el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">
         <el-option
           v-for="item in Province"
@@ -1633,4 +1633,9 @@ export default {
     margin-top: 10px;
     margin-right: 40px;
   }
+  .el-table td, .el-table th.is-leaf,
+  .el-radio__inner,
+  .el-input__inner{
+    border: 1px solid black!important;
+  }
 </style>
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index cc01a875..5cc03949 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -50,7 +50,7 @@
         @expand-change="selectMachine">
         <el-table-column type="expand">
           <template slot-scope="scope">
-            <el-table :data="tableData2" border style="width: 490px; text-align: center" size="mini">
+            <el-table :data="tableData2" border style="width: 491px; text-align: center" size="mini">
               <el-table-column label="设备型号" align="center" width="130">
                 <template slot-scope="scope">
                   {{ scope.row.机床图号 }}
@@ -1282,4 +1282,9 @@ a{
   display: inline-block;
   color: #999;
 }
+.el-table td, .el-table th.is-leaf,
+.el-radio__inner,
+.el-input__inner{
+  border: 1px solid black!important;
+}
 </style>

From a035447b36cd01e67a9558df68db07a8d4792e0e Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 27 Mar 2019 08:48:57 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/element-ui.scss                 |  12 +-
 src/views/Inventory/StockInquiry/index.vue | 165 ---------------------
 2 files changed, 6 insertions(+), 171 deletions(-)

diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 46dca356..184ab3ad 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -27,12 +27,12 @@
     }
   }
 }
- .el-table td, .el-table th.is-leaf{
-   border-bottom: 1px solid DarkGray;
-   border-left: 1px solid DarkGray;
-   border-top: 1px solid DarkGray;
-   border-right: 1px solid DarkGray;
- }
+ //.el-table td, .el-table th.is-leaf{
+ //  border-bottom: 1px solid DarkGray;
+ //  border-left: 1px solid DarkGray;
+ //  border-top: 1px solid DarkGray;
+ //  border-right: 1px solid DarkGray;
+ //}
  .el-textarea__inner,
  .el-radio__inner,
  .el-input__inner{
diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue
index 56693e1c..e69de29b 100644
--- a/src/views/Inventory/StockInquiry/index.vue
+++ b/src/views/Inventory/StockInquiry/index.vue
@@ -1,165 +0,0 @@
-<template>
-  <div>
-    <el-card>
-      <span>项目名称:</span>
-      <el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine">
-        <el-option
-          v-for="item in Project"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>机床图号:</span>
-      <el-select v-model="MachineValue" filterable clearable size="small" placeholder="机床图号" style="width: 200px;margin-right:10px" @change="searchGroupList">
-        <el-option
-          v-for="item in Machine"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>组号:</span>
-      <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 200px;margin-right:10px">
-        <el-option
-          v-for="item in GroupNum"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>零件图号:</span>
-      <el-input v-model="Partpaint" clearable size="small" style="width:200px;margin-right:10px" />
-      <span>库位:</span>
-      <el-select v-model="StoreHouseValue" filterable clearable size="small" placeholder="组号" style="width: 200px;margin-right:10px">
-        <el-option
-          v-for="item in StoreHouse"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="">查询</el-button>
-    </el-card>
-
-    <el-card>
-      <el-table
-        v-loading="listLoadingx1"
-        :data="HouseDataBasic"
-        border
-        size="mini"
-        style="width: 100%;"
-        height="200">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          width="50"/>
-        <el-table-column label="入库时间" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.入库时间 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="库位" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.货位名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件名称" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件图号" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.零件图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="项目名称" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.项目名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="机床图号" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.机床图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="组号" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.组号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件数量" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.货位存量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件类型" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.类型名称 }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-  </div>
-</template>
-
-<script>
-  import { initProject, searchmachine, searchTeam } from '@/api/Inventory/StockInquiry'
-  export default {
-    data() {
-      return {
-        ProjectValue: '',
-        Project: [],
-        ProjectValue_check: 1,
-        MachineValue: '',
-        Machine: [],
-        MachineValue_check: 1,
-        GroupNumValue: '',
-        GroupNumValue_check: 1,
-        GroupNum: [],
-        Partpaint: '',
-        StoreHouseValue: '',
-        StoreHouse: [],
-        HouseDataBasic: [],
-      }
-    },
-    created(){
-      this.fetchData()
-    },
-    methods: {
-      fetchData() {
-        this.getSelect(initProject, ['项目名称', '项目流水号'], 'Project') // 项目名称
-      },
-      searchMachine() { // 查询机床
-        this.Machine = []
-        this.GroupNum = []
-        this.MachineValue = ''
-        this.GroupNumValue = ''
-        if (this.ProjectValue !== '') {
-          searchmachine(1, this.ProjectValue).then(response => {
-            for (let i = 0; i < response.data.length; i++) {
-              this.Machine.push({
-                label: response.data[i].机床图号,
-                value: response.data[i].机床流水号
-              })
-            }
-          })
-        }
-      },
-      searchGroupList() { // 查询组号
-        this.GroupNum = []
-        this.GroupNumValue = ''
-        searchTeam(this.MachineValue).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.GroupNum.push({
-              label: response.data[i].组号,
-              value: response.data[i].组件流水号
-            })
-          }
-        })
-      },
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>

From 7f7fdc7b920a98c0f49ce0072a4ae62119823ef1 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 27 Mar 2019 09:12:49 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../machiningHoursStatistics/index.vue          | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
index 177c52bf..ead8c4b8 100644
--- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
@@ -27,16 +27,16 @@
     <el-card>
       <el-col :span="6">
         <el-table v-loading="loading" :data="tableData" highlight-current-row height="580" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
-          <el-table-column
-            label=" "
-            type="index"
-            align="center"
-            width="50"/>
-          <el-table-column label="操作者" align="center" width="130px">
+          <el-table-column label="操作者" align="center" width="110px">
             <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.实际加工时间段 }}
@@ -56,11 +56,6 @@
       </el-col>
       <el-col :span="17" style="margin-left: 30px;">
         <el-table v-loading="loading2" :data="tableData2" height="580" style="width: 100%;" border element-loading-text="拼命加载中">
-          <el-table-column
-            label=" "
-            type="index"
-            align="center"
-            width="50"/>
           <el-table-column label="零件图号" align="center" width="150px">
             <template slot-scope="scope">
               {{ scope.row.零件图号 }}

From 1938b741b25deb3655a9728f4f21d8596eaa455a Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 27 Mar 2019 09:40:33 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../machiningHoursStatistics/index.vue                 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
index ead8c4b8..93e072fb 100644
--- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
@@ -61,16 +61,21 @@
               {{ scope.row.零件图号 }}
             </template>
           </el-table-column>
-          <el-table-column label="零件名称" align="center" width="150px">
+          <el-table-column label="零件名称" align="center" width="130px">
             <template slot-scope="scope">
               {{ scope.row.零件名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="工艺名称" align="center" width="130px">
+          <el-table-column label="工艺名称" align="center" width="120px">
             <template slot-scope="scope">
               {{ scope.row.工艺名称 }}
             </template>
           </el-table-column>
+          <el-table-column label="完成数量" align="center" width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.完成数量 }}
+            </template>
+          </el-table-column>
           <el-table-column label="理论工时" align="center" width="100px">
             <template slot-scope="scope">
               {{ scope.row.理论加工时间段 }}
@@ -165,6 +170,7 @@ export default {
         if (response.data.total === 0) {
           this.loading2 = false
         } else {
+          console.log(response.data)
           this.total2 = response.data.total
           this.tableData2 = response.data.rows
         }