Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

2020-01-08 20:04:35 +08:00
parent 9dc1d181af 83071936ce
commit 98ab4e8779
6 changed files with 95 additions and 17 deletions
--- a/src/api/ManufacturingCenter/ContractDetailsInquiry.js
+++ b/src/api/ManufacturingCenter/ContractDetailsInquiry.js
--- 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
--- 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>
--- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
+++ 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>
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -24,11 +24,11 @@
      <el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</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"
@@ -70,7 +70,7 @@
          </el-table>
        </el-card>
      </el-col>
-      <el-col style="width: 810px">
+      <el-col style="width: 60%">
        <el-card>
          <el-table
            :data="tableData"
@@ -86,17 +86,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>
@@ -399,6 +399,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({
@@ -409,7 +410,8 @@ export default {
              操作者: response.data[i].操作者,
              不合格数量: response.data[i].不合格数量,
              质检数量: response.data[i].数量,
-              工序流水号: response.data[i].工序流水号
+              工序流水号: response.data[i].工序流水号,
+              工序状态: response.data[i].工序状态
            })
          }
        }
@@ -480,6 +482,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
--- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
+++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
@@ -130,12 +130,12 @@

 <script>
 import { searchtable, searchtable2 } from '@/api/ManufacturingCenter/ScheduleCompletionDetails'
-import { getNowTime, getNowTime1 } from '@/utils/tool'
+import { getNowShotTime } from '@/utils/tool'
 export default {
  data() {
    return {
-      startTime: getNowTime1(), // 开始时间
-      endTime: getNowTime(), // 结束时间
+      startTime: getNowShotTime(), // 开始时间
+      endTime: getNowShotTime(), // 结束时间
      tableData: [], // 操作者工时统计
      loading: '',
      tableData2: [], // 工序统计表
@@ -160,8 +160,11 @@ export default {
      this.tableData = []
      this.tableData2 = []
      this.total2 = 0
-      searchtable(this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => {
-        console.log(response.data, 111)
+      var STime = ''
+      var ETime = ''
+      STime = this.startTime + ' 00:00:00'
+      ETime = this.endTime + ' 23:59:59'
+      searchtable(STime, ETime, this.pageCurrent, this.pageSize).then(response => {
        if (response.data.total === 0) {
          this.loading = false
        } else {
@@ -171,12 +174,17 @@ export default {
      }).then(() => {
        this.loading = false
      })
-    }, // 获取工序表
+    },
+    // 获取工序表
    searchTable2(row) {
      this.loading2 = true
      this.tableData2 = []
      this.pageCurrent2 = 1
-      searchtable2(row.人员编号, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => {
+      var STime = ''
+      var ETime = ''
+      STime = this.startTime + ' 00:00:00'
+      ETime = this.endTime + ' 23:59:59'
+      searchtable2(row.人员编号, STime, ETime, this.pageCurrent2, this.pageSize2).then(response => {
        console.log(response.data, 222)
        if (response.data.rows.length !== 0) {
          this.tableData2 = response.data.rows