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

2019-05-31 12:11:42 +08:00
parent a4b17311b8 ef1237ac3d
commit 398c631fa6
9 changed files with 210 additions and 101 deletions
--- a/debug.log
+++ b/debug.log
@@ -1,2 +1,3 @@
 [0301/083149.303:ERROR:http_transport_win.cc(273)] WinHttpSendRequest: 操作成功完成。 (0x0)
 [0515/102246.688:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0)
+[0531/081503.881:ERROR:http_transport_win.cc(276)] WinHttpSendRequest: 操作成功完成。 (0x0)
--- a/src/api/Assembly/QualityInspectionInformationInquiry.js
+++ b/src/api/Assembly/QualityInspectionInformationInquiry.js
@@ -11,27 +11,27 @@ export function initProject() {
    }
  })
 }
-// PDM_机床名称_发货状态_查询数据
-export function selecttable(check2, machineNumberValue) {
+// 组件查询
+export function searchgroup(num) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
-      name: 'PDM_机床名称_发货状态_查询数据',
-      param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue
+      name: 'PDM_组件名称_查询数据',
+      param: '机床流水号=' + num
    }
  })
 }
-// PDM_机床名称_发货状态_编辑数据
-export function updatestate(machineNumberValue, state) {
+// 组件查询
+export function selecttable(check1, value1, check2, value2, check3, value3) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
-      name: 'PDM_机床名称_发货状态_编辑数据',
-      param: '机床流水号=' + machineNumberValue + '&发货状态=' + state
+      name: '质量管理_质量情况_查询数据',
+      param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3
    }
  })
 }
--- a/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js
+++ b/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'

-// 查询零件（包含借用件）
+// 查询零件未编制（包含借用件）
 export function getPartnames3(num1, num2) {
  return request({
    url: '',
@@ -12,6 +12,18 @@ export function getPartnames3(num1, num2) {
    }
  })
 }
+// 查询零件已编制（包含借用件）
+export function getPartnames4(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_查询已完成工艺制定零件_按人员机床组号或图号查',
+      param: '工艺人员编号=' + num1 + '&机床组号或图号=' + num2
+    }
+  })
+}
 // 典艺查询<高精原有数据>
 export function searchProcess11(num) {
  return request({
@@ -491,3 +503,15 @@ export function TableAddLi(a, b, c, num0, num1) {
    }
  })
 }
+// 修改备注
+export function modifyRemark(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工艺计划_工艺修改记录_增加数据',
+      param: `修改人员编号=${params[0]}&修改备注=${params[1]}&工艺计划流水号=${params[2]}`
+    }
+  })
+}
--- a/src/views/Assembly/AssemblyExecution/index.vue
+++ b/src/views/Assembly/AssemblyExecution/index.vue
@@ -3,7 +3,7 @@
    <el-card>
      <el-row>
        <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange();searchTable1()">
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1();searchTable2()">
          <el-option
            v-for="item in machineNumber"
            :key="item.value"
@@ -13,20 +13,20 @@
            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
          </el-option>
        </el-select>
-        <span>组号:</span>
-        <el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable @change="searchTable2()">
-          <el-option
-            v-for="item in groupNumber"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable1();searchTable2()">查询</el-button>
+        <!--        <span>组号:</span>-->
+        <!--        <el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable @change="searchTable2()">-->
+        <!--          <el-option-->
+        <!--            v-for="item in groupNumber"-->
+        <!--            :key="item.value"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value"/>-->
+        <!--        </el-select>-->
+        <!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable1();searchTable2()">查询</el-button>-->
      </el-row>
    </el-card>
    <el-card>
      <h3 style="text-align: center;">总装调试</h3>
-      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="280px">
+      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="100px">
        <el-table-column label="项目名称" align="center">
          <template slot-scope="scope">
            {{ scope.row.项目名称 }}
@@ -61,7 +61,7 @@
    </el-card>
    <el-card>
      <h3 style="text-align: center;">部装</h3>
-      <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="280px">
+      <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
        <el-table-column label="项目名称" align="center">
          <template slot-scope="scope">
            {{ scope.row.项目名称 }}
--- a/src/views/Assembly/DeliveryApplication/index.vue
+++ b/src/views/Assembly/DeliveryApplication/index.vue
@@ -13,7 +13,7 @@
            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
          </el-option>
        </el-select>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>
+<!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>-->
      </el-row>
    </el-card>
    <el-card>
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -3,7 +3,7 @@
    <el-card>
      <el-row>
        <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="selecttable()">
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange()">
          <el-option
            v-for="item in machineNumber"
            :key="item.value"
@@ -13,6 +13,24 @@
            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
          </el-option>
        </el-select>
+        <span>组号:</span>
+        <el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable>
+          <el-option
+            v-for="item in groupNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>质检类型:</span>
+        <el-select v-model="QualityTypeNumber" filterable placeholder="质检类型" size="small" clearable>
+          <el-option
+            v-for="item in QualityTypeValue"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>零件:</span>
+        <el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 200px" size="small" clearable/>
        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>
      </el-row>
    </el-card>
@@ -23,7 +41,7 @@
            {{ 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>
@@ -33,21 +51,49 @@
            {{ 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-column label="注意事项" align="center">
+        <el-table-column label="零件图号" align="center">
          <template slot-scope="scope">
-            {{ scope.row.注意事项 }}
+            {{ scope.row.零件图号 }}
          </template>
        </el-table-column>
-        <el-table-column label="操作" align="center" width="250px" fixed="right">
+        <el-table-column label="零件名称" align="center">
          <template slot-scope="scope">
-            <el-button v-if="scope.row.发货状态===null || scope.row.发货状态===0" type="success" size="small" @click="handlconfirm(scope.row)">确认发货</el-button>
-            <el-button v-else-if="scope.row.发货状态===1" type="danger" size="small">待  审批</el-button>
-            <el-button v-else type="info" size="small" >已审批</el-button>
+            {{ 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.数量 }}
+          </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.不合格原因 }}
+          </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.备注 }}
          </template>
        </el-table-column>
      </el-table>
@@ -56,7 +102,7 @@
 </template>

 <script>
-import { initProject, selecttable, updatestate } from '@/api/Assembly/QualityInspectionInformationInquiry'
+import { initProject, searchgroup, selecttable } from '@/api/Assembly/QualityInspectionInformationInquiry'
 // import { mapGetters } from 'vuex'
 export default {
  data() {
@@ -65,8 +111,10 @@ export default {
      machineNumber: [],
      groupNumberValue: '',
      groupNumber: [],
+      QualityTypeNumber: [],
+      QualityTypeValue: '',
      tableData1: [],
-      tableData2: []
+      SpareParts: ''
    }
  },
  created() {
@@ -87,17 +135,26 @@ export default {
        }
      })
    },
-    selecttable() {
-      this.tableData1 = []
-      if (this.machineNumberValue !== '') { this.check2 = 1 } else { this.check2 = 0 }
-      selecttable(this.check2, this.machineNumberValue).then(response => {
-        this.tableData1 = response.data
-        console.log(response.data)
+    machineChange() {
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      searchgroup(this.machineNumberValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+          })
+        }
      })
    },
-    handlconfirm(row) {
-      updatestate(row.机床流水号, 1).then(response => {
-        this.selecttable()
+    selecttable() {
+      this.tableData1 = []
+      if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 }
+      if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
+      if (this.SpareParts !== '' && this.SpareParts !== null) { this.check3 = 1 } else { this.check3 = 0 }
+      selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts).then(response => {
+        this.tableData1 = response.data
+        console.log(response.data, 1111)
      })
    }
  }
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -76,6 +76,11 @@
            {{ scope.row.批次数量 }}
          </template>
        </el-table-column>
+        <el-table-column label="工艺员" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.工艺员 }}
+          </template>
+        </el-table-column>
      </el-table>
      <div class="block" style="margin-top: 10px;">
        <el-pagination
--- a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
@@ -1,6 +1,10 @@
 <template>
  <div class="app-container">
    <el-card>
+      <el-radio-group v-model="radio" size="small" style="margin: 10px;" @change="checked = false;partNum=[];partNumValue = '';typeValue = '';partName = '';material = '';materialName = '';prepareMateriel = '';spec = '';batchNum = '';searchPartsByMachineGroup();">
+        <el-radio v-model="radio" :label="1">未编制</el-radio>
+        <el-radio v-model="radio" :label="2">已编制</el-radio>
+      </el-radio-group>
      <span>工艺员:</span>
      <el-select v-model="CraftmenValue" placeholder="工艺员" size="small" style="width:100px" @change="clearDetail();">
        <el-option
@@ -29,10 +33,8 @@
        </el-option>
      </el-select>
      <el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">是否核准</el-checkbox>
-      <el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整
-      </el-button>
-      <el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式
-      </el-button>
+      <!--<el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>-->
+      <!--<el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式</el-button>-->
      <div v-show="isShow">
        <span>种类:</span>
        <el-input v-model="typeValue" placeholder="种类" size="small" readonly style="width:100px"/>
@@ -168,6 +170,7 @@
          <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-tickets" @click="saveApprove">保存
          </el-button>
        </el-button-group>
+        <el-button v-if="!isShow1" type="warning" size="small" icon="el-icon-tickets" @click="saveCompiled">记录修改备注</el-button>
      </el-row>
      <div style="margin-top: 5px;margin-bottom: 10px;display: inline-block"><span>符号：</span>
        <el-tag type="info">∮</el-tag>
@@ -211,21 +214,10 @@
              @change="handleChange(scope.row)"/>
          </template>
        </el-table-column>
-        <el-table-column v-if="false" prop="name" label="工艺名称" width="130" align="center">
-          <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.工艺名称"
-              :disabled="disabled"
-              readonly
-              style="width:100%"
-              @dblclick.native="tableSearch(scope.$index)"/>
-          </template>
-        </el-table-column>
        <el-table-column prop="hard" label="难度等级" width="110" align="center">
          <template slot-scope="scope">
            <el-select
              v-model="scope.row.工艺难度等级"
-              :disabled="disabled"
              clearable
              placeholder=""
              @change="hardEdit(scope.row)">
@@ -235,17 +227,6 @@
            </el-select>
          </template>
        </el-table-column>
-        <el-table-column v-if="false" prop="request" label="工艺要求" align="center" min-width="350">
-          <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.工艺要求"
-              :rows="1"
-              :disabled="disabled"
-              type="textarea"
-              @dblclick.native="tableSearch(scope.$index)"
-              @change="requestEdit(scope.row)"/>
-          </template>
-        </el-table-column>
        <el-table-column prop="request" label="工艺要求" align="center" min-width="350">
          <template slot-scope="scope">
            <el-autocomplete
@@ -272,22 +253,18 @@
          <template slot-scope="scope">
            <div>
              <el-button
-                :disabled="disabled"
                icon="el-icon-arrow-up"
                type="primary"
                @click="upOne(scope.row)"/>
              <el-button
-                :disabled="disabled"
                icon="el-icon-arrow-down"
                type="primary"
                @click="downOne(scope.row)"/>
              <el-button
-                :disabled="disabled"
                icon="el-icon-circle-plus-outline"
                type="primary"
                @click="insertOne(scope.row)"/>
              <el-button
-                :disabled="disabled"
                icon="el-icon-delete"
                type="danger"
                @click="deleteOne(scope.row)"/>
@@ -552,7 +529,9 @@ import {
  readyChange,
  TableAddLi1,
  TableAddLi,
-  getPartnames3
+  getPartnames3,
+  getPartnames4,
+  modifyRemark
 } from '@/api/ManufacturingCenter/ProcessQuotaEstablishment'
 import elInput from 'element-ui/packages/input'
 import { mapGetters } from 'vuex'
@@ -720,13 +699,33 @@ export default {
      'id'
    ])
  },
-  created() {
+  mounted() {
    this.fetchData()
    this.initPerson()
    this.getList()
    this.openCascader()
  },
  methods: {
+    // 保存已编制
+    saveCompiled() {
+      if (this.partNumValue) {
+        this.$prompt('请输入工艺修改备注', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消'
+        }).then(({ value }) => {
+          console.log(value, '日期', this.id, this.partNumValue)
+          modifyRemark(this.id, value, this.partNumValue)
+          this.$message.success('记录成功')
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '取消操作'
+          })
+        })
+      } else {
+        this.$message.warning('请选择零件')
+      }
+    },
    blurRequest(row) {
      selectRequest(row.工序流水号, row.工艺计划流水号, row.工艺编号, row.工序顺序, row.工艺要求).then(response => {
        if (response.data[0].result === '1') {
@@ -1087,20 +1086,38 @@ export default {
    searchPartsByMachineGroup() {
      this.tableData = []
      this.partNum = []
-      this.disabled = false
-      this.isShow1 = true
-      this.isShow2 = false
-      this.checked1 = true
-      getPartnames3(this.CraftmenValue, this.machine_Group_part).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.partNum.push({
-            label: response.data[i].零件图号,
-            value: response.data[i].工艺计划流水号,
-            machine: response.data[i].机床图号,
-            group: response.data[i].组号
-          })
-        }
-      })
+      if (this.radio === 1) { // 未编制
+        this.disabled = false
+        this.isShow1 = true
+        this.isShow2 = false
+        this.checked1 = true
+        getPartnames3(this.CraftmenValue, this.machine_Group_part).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.partNum.push({
+              label: response.data[i].零件图号,
+              value: response.data[i].工艺计划流水号,
+              machine: response.data[i].机床图号,
+              group: response.data[i].组号
+            })
+          }
+        })
+      } else { // 已编制
+        this.isShow = true
+        this.isShow1 = false
+        this.isShow2 = true
+        this.disabled = true
+        this.checked1 = false
+        getPartnames4(this.CraftmenValue, this.machine_Group_part).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.partNum.push({
+              label: response.data[i].零件图号,
+              value: response.data[i].工艺计划流水号,
+              machine: response.data[i].机床图号,
+              group: response.data[i].组号
+            })
+          }
+        })
+      }
    },
    searchParts() { // 根据条件查零件号
      this.tableData = []
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -50,28 +50,28 @@
      <el-table
        v-loading="loading0"
        :data="tableData"
-        style="width: 100%;max-height: 600px"
-        height="600"
+        style="width: 100%;max-height: 610px"
+        height="610"
        size="mini"
        highlight-current-row
        border>
-        <el-table-column align="center" label="序号" type="index" width="60px"/>
-        <el-table-column align="center" label="机床图号" width="170px">
+        <el-table-column align="center" label="序号" type="index" width="50px"/>
+        <el-table-column align="center" label="机床图号" width="100px">
          <template slot-scope="scope">
            {{ scope.row.机床图号 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="组号" width="140px">
+        <el-table-column align="center" label="组号" width="60px">
          <template slot-scope="scope">
            {{ scope.row.组号 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="零件图号" width="200px">
+        <el-table-column align="center" label="零件图号" width="150px">
          <template slot-scope="scope">
            {{ scope.row.零件图号 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="零件名称" width="180px">
+        <el-table-column align="center" label="零件名称" width="100px">
          <template slot-scope="scope">
            {{ scope.row.零件名称 }}
          </template>
@@ -81,17 +81,17 @@
            {{ scope.row.投产总数量 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="投产时间" width="130px">
+        <el-table-column align="center" label="投产时间" width="100px">
          <template slot-scope="scope">
            {{ scope.row.传递时间 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="零件状态" width="750px">
+        <el-table-column align="center" label="零件状态" min-width="960px">
          <template slot-scope="scope">
-            <el-steps :active="scope.row.考核状态" finish-status="success" simple>
+            <el-steps id="StatusQuery" :active="scope.row.考核状态" finish-status="success" simple>
              <el-step title="投产" />
-              <el-step title="工艺" />
-              <el-step title="定额" />
+              <el-step title="工艺定额" />
+              <!--<el-step title="定额" />-->
              <el-step title="平衡" />
              <el-step title="完成" />
              <el-step title="入库" />
@@ -491,3 +491,8 @@ export default {
    margin: 10px 0 10px 10px;
  }
 </style>
+<style>
+  #StatusQuery {
+    padding: 8px 30px;
+  }
+</style>