From fd02edb41c5227f71bd435b5b62996372d8d044f Mon Sep 17 00:00:00 2001
From: bryan sun <hitsjt@gmail.com>
Date: Tue, 7 Jan 2020 12:54:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContractDetailsInquiry.js                 |  0
 src/utils/request.js                          |  2 +-
 .../SelfMadePartsWarehouseOut/index.vue       |  6 +-
 .../ContractDetailsInquiry/index.vue          | 60 +++++++++++++++++++
 .../ProcessingStatusNew/index.vue             | 22 ++++---
 5 files changed, 80 insertions(+), 10 deletions(-)
 create mode 100644 src/api/ManufacturingCenter/ContractDetailsInquiry.js
 create mode 100644 src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue

diff --git a/src/api/ManufacturingCenter/ContractDetailsInquiry.js b/src/api/ManufacturingCenter/ContractDetailsInquiry.js
new file mode 100644
index 00000000..e69de29b
diff --git a/src/utils/request.js b/src/utils/request.js
index fc41e22d..b38cd4df 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -18,7 +18,7 @@ export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` //
 export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx`
 export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx`
 export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
-export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel
+export const ExcelDownLoad = 'http:/192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel
 // 技术中心程序发布时要更改下面所有的IP到0段
 export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
 export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图  发布时改成0.231
diff --git a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
index e4e46fa8..809cac35 100644
--- a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
+++ b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
@@ -313,6 +313,8 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style>
+  .el-checkbox__inner {
+  border: 1px solid black !important;
+}
 </style>
diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
new file mode 100644
index 00000000..e4cccfff
--- /dev/null
+++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
@@ -0,0 +1,60 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <span>项目名称</span>
+      <el-select v-model="projectValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="项目名称" @change="typeChange()">
+        <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" clearable filterable size="small" style="margin-bottom:10px;width: 220px" placeholder="机床名称">
+        <el-option
+          v-for="item in machine"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { initProject, initMachine } from '@/api/ManufacturingCenter/ProjectPlanningQuery'
+export default {
+  data() {
+    return {
+      project: [],
+      projectValue: '', // 项目名称
+      machineValue: '', // 机床名称
+      machine: []
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
+    },
+    typeChange() {
+      this.machineValue = ''
+      this.machine = []
+      initMachine(this.projectValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machine.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
index ed3ac8d7..446d7eca 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -23,11 +23,11 @@
       <el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
     </el-card>
     <el-row>
-      <el-col style="width: 550px">
+      <el-col style="width: 40%">
         <el-card>
           <el-table
             :data="tableData1"
-            :row-class-name="tableRowClassName"
+            :row-class-name="tableRowClassName1"
             loading="loading"
             class="table"
             style="max-height: 830px"
@@ -69,7 +69,7 @@
           </el-table>
         </el-card>
       </el-col>
-      <el-col style="width: 810px">
+      <el-col style="width: 60%">
         <el-card>
           <el-table
             :data="tableData"
@@ -85,17 +85,17 @@
                 <el-radio :label="scope.row.序号" v-model="radio"/>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="跟单号" width="100">
+            <el-table-column align="center" label="跟单号" width="80">
               <template slot-scope="scope">
                 {{ scope.row.跟单号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="零件图号" show-overflow-tooltip width="280">
+            <el-table-column align="center" label="零件图号" show-overflow-tooltip width="200">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="零件名称" show-overflow-tooltip width="200">
+            <el-table-column align="center" label="零件名称" show-overflow-tooltip width="150">
               <template slot-scope="scope">
                 {{ scope.row.零件名称 }}
               </template>
@@ -371,6 +371,7 @@ export default {
       this.tableData1 = []
       this.row2 = row
       gettabledata1(row.工艺计划流水号).then(response => {
+        console.log(response, 1212121)
         if (response.data.length !== 0) {
           for (let i = 0; i < response.data.length; i++) {
             this.tableData1.push({
@@ -381,7 +382,8 @@ export default {
               操作者: response.data[i].操作者,
               不合格数量: response.data[i].不合格数量,
               质检数量: response.data[i].数量,
-              工序流水号: response.data[i].工序流水号
+              工序流水号: response.data[i].工序流水号,
+              工序状态: response.data[i].工序状态
             })
           }
         }
@@ -452,6 +454,12 @@ export default {
       if (parseInt(row.考核状态) > 6) {
         return 'CompleteColor'
       }
+    }, // 工序状态变色
+    tableRowClassName1({ row, rowIndex }) {
+      row.index = rowIndex
+      if (parseInt(row.工序状态) > 3) {
+        return 'CompleteColor'
+      }
     }, // 重置表单
     callOff(formName) {
       this.dialogFormVisible = false