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

src/api/BasicData/SystemRrolemaintenance.js

@@ -21,15 +21,14 @@ export function deleteData(code) {
     }
   })
 }
-export function searchTable(num, pageCurrent, pageSize) {
+export function searchTable(num) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '菜单系统模块_项目角色_查询数据_MESWORK',
-      param: '角色功能=' + num + '=string',
-      Pagination: pageCurrent + '&' + pageSize
+      param: '角色功能=' + num + '=string'
     }
   })
 }

src/api/ManufacturingCenter/InitialProduction.js

@@ -50,50 +50,50 @@ export function getTable(num, pageList, pageSize) {
   })
 }
 // 投产
-export function production(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem) {
+export function production(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem, IsUrgentItem) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递',
-      param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int'
+      param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int&是否加急件=' + IsUrgentItem + '=int'
     }
   })
 }
 // 合并投产
-export function production2(num1, num2, num, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem) {
+export function production2(num1, num2, num, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem, IsUrgentItem) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_合并投产',
-      param: '零件图号=' + num1 + '&规格=' + num2 + '&机床流水号=' + num + '&投产类型流水号=' + 1 + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int'
+      param: '零件图号=' + num1 + '&规格=' + num2 + '&机床流水号=' + num + '&投产类型流水号=' + 1 + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int&是否加急件=' + IsUrgentItem + '=int'
     }
   })
 }
 // 备料投产
-export function production10(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem) {
+export function production10(num, a, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem, IsUrgentItem) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_备料',
-      param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int'
+      param: '组件零件基本件流水号=' + num + '=int&投产类型流水号=' + a + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int&是否加急件=' + IsUrgentItem + '=int'
     }
   })
 }
 // 合并备料投产
-export function production20(num1, num2, num, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem) {
+export function production20(num1, num2, num, b, d, e, f, g, h, i, j, k, l, m, n, o, p, q, x, s, t, u, v, w, UrgentItem, IsUrgentItem) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '设备管理_可安排生产计划零件排序_制定组时间_同时传递_合并投产_备料',
-      param: '零件图号=' + num1 + '&规格=' + num2 + '&机床流水号=' + num + '&投产类型流水号=' + 1 + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int'
+      param: '零件图号=' + num1 + '&规格=' + num2 + '&机床流水号=' + num + '&投产类型流水号=' + 1 + '=int&数据类型=' + b + '=int&投产批次=1=int&批次数量=' + d + '=string&计划开始时间=' + e + '=string&计划结束时间=' + f + '=string&工艺计划开始时间=' + g + '=string&工艺计划结束时间=' + h + '=string&定额计划开始时间=' + i + '=string&定额计划结束时间=' + j + '=string&计划编制计划开始时间=' + k + '=string&计划编制计划结束时间=' + l + '=string&机加工开始时间=' + m + '=string&机加工结束时间=' + n + '=string&单件外协时间=' + o + '=string&单件是否外协=' + p + '=int&单件是否外协分类=' + q + '=string&计划制定人员编号=' + x + '&材料流水号=' + s + '=int&是否临时件=' + t + '=int&是否难度件=' + u + '=string&是否着急=' + v + '=int&是否白图=' + w + '=int&是否加急=' + UrgentItem + '=int&是否加急件=' + IsUrgentItem + '=int'
     }
   })
 }
@@ -170,3 +170,14 @@ export function edit(num) {
     }
   })
 }
+// 用于提醒
+export function searchUrgentItem() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_加急件未打印条数查询'
+    }
+  })
+}

src/views/BasicData/SystemRrolemaintenance/index.vue

@@ -3,7 +3,7 @@
     <el-card>
       <!--      <span>角色功能:</span>-->
       <el-input v-model="RoleFunctioning" size="small" clearable placeholder="请输入角色功能" style="width:200px"/>
-      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="pageCurrent=1;pageSize = 10;searchData()">查询</el-button>
+      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="searchData()">查询</el-button>
       <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
     </el-card>
     <el-card style="margin-top: 0px">
@@ -99,9 +99,6 @@ export default {
   data() {
     return {
       RoleFunctioning: '',
-      pageCurrent: 1,
-      pageSize: 10,
-      total: null,
       loading: false,
       tableData: [],
       dialogFormVisible1: false,
@@ -134,9 +131,8 @@ export default {
     },
     searchData() {
       this.loading = true
-      searchTable(this.RoleFunctioning, this.pageCurrent, this.pageSize).then(response => {
-        this.tableData = response.data.rows
-        this.total = response.data.total
+      searchTable(this.RoleFunctioning).then(response => {
+        this.tableData = response.data
         this.loading = false
         console.log(response.data)
       })

src/views/ManufacturingCenter/InitialProduction/index.vue

@@ -91,6 +91,7 @@
         <el-table
           v-loading="listLoading"
           :data="tableData"
+          :row-class-name="tableRowClassName"
           border
           stripe
           highlight-current-row
@@ -615,6 +616,7 @@ export default {
               数据类型: response.data.rows[i].数据类型,
               零件备注: response.data.rows[i].零件备注,
               规格: response.data.rows[i].规格,
+              是否加急件: response.data.rows[i].是否加急件,
               材料流水号: response.data.rows[i].材料流水号,
               checked_dailiao: false,
               checked_waixie: false,
@@ -845,6 +847,7 @@ export default {
                   投产类型流水号: response.data.rows[i].投产类型流水号,
                   数据类型: response.data.rows[i].数据类型,
                   零件备注: response.data.rows[i].零件备注,
+                  是否加急件: response.data.rows[i].是否加急件,
                   规格: response.data.rows[i].规格,
                   材料流水号: response.data.rows[i].材料流水号,
                   checked_dailiao: false,
@@ -923,7 +926,7 @@ export default {
                 } else {
                   this.checked_baitu = 1
                 }
-                production2(this.multipleSelection[i].零件图号, this.multipleSelection[i].规格, this.toolNumValue, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem).then(response => {
+                production2(this.multipleSelection[i].零件图号, this.multipleSelection[i].规格, this.toolNumValue, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem, this.multipleSelection[i].是否加急件).then(response => {
                   this.result += parseInt(response.data[0].result)
                   if (this.result === this.multipleSelection.length) {
                     this.$message.success('投产成功')
@@ -971,7 +974,7 @@ export default {
                 } else {
                   this.checked_baitu = 1
                 }
-                production(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem).then(response => {
+                production(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem, this.multipleSelection[i].是否加急件).then(response => {
                   this.result += parseInt(response.data[0].result)
                   if (this.result === this.multipleSelection.length) {
                     this.$message.success('投产成功')
@@ -1043,7 +1046,7 @@ export default {
                 } else {
                   this.checked_baitu = 1
                 }
-                production20(this.multipleSelection[i].零件图号, this.multipleSelection[i].规格, this.toolNumValue, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem).then(response => {
+                production20(this.multipleSelection[i].零件图号, this.multipleSelection[i].规格, this.toolNumValue, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem, this.multipleSelection[i].是否加急件).then(response => {
                   this.result += parseInt(response.data[0].result)
                   if (this.result === this.multipleSelection.length) {
                     this.$message.success('投产成功')
@@ -1091,7 +1094,7 @@ export default {
                 } else {
                   this.checked_baitu = 1
                 }
-                production10(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem).then(response => {
+                production10(this.multipleSelection[i].组件零件基本件流水号, this.multipleSelection[i].投产类型流水号, this.multipleSelection[i].数据类型, this.multipleSelection[i].投产总数量, this.time_planStart, this.time_planFinish, this.time_gongyiStart, this.time_gongyiFinish, this.time_dingeStart, this.time_dingeFinish, this.time_planpinghengStart, this.time_planpinghengFinish, this.time_machiningStart, this.time_machiningFinish, this.time_planStart, this.multipleSelection[i].checked_waixie, this.multipleSelection[i].checked_dailiao, this.id, this.multipleSelection[i].材料流水号, this.radio, this.checked_gaonandu, this.multipleSelection[i].checked_zhaoji, this.checked_baitu, this.UrgentItem, this.multipleSelection[i].是否加急件).then(response => {
                   this.result += parseInt(response.data[0].result)
                   if (this.result === this.multipleSelection.length) {
                     this.$message.success('投产成功')
@@ -1140,6 +1143,11 @@ export default {
         }
       }
     },
+    tableRowClassName({ row }) {
+      if (row.是否加急件 === '1') {
+        return 'IsUrgentItem'
+      }
+    },
     // 打回档案
     handleDele(index, row, formName) {
       this.count2 = this.count2 + 1
@@ -1248,3 +1256,8 @@ export default {
     /*margin-left: 120px;*/
   }
 </style>
+<style>
+  .el-table .IsUrgentItem{
+    background: #ff7575;
+  }
+</style>

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -63,7 +63,7 @@
     <el-card>
       <el-tabs type="border-card" @tab-click="selectPart">
         <el-tab-pane label="基本件">
-          <el-table :data="tableData1" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
+          <el-table :data="tableData1" :row-class-name="tableRowClassName1" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
             <el-table-column align="center" width="50" type="selection"/>
             <el-table-column label="零件名称" align="center" width="120px">
               <template slot-scope="scope">
@@ -852,6 +852,11 @@ export default {
         return 'adopt'
       }
     },
+    tableRowClassName1({ row }) {
+      if (row.是否加急件 === 1) {
+        return 'isUrgentItem'
+      }
+    },
     machineChange() {
       this.groupNumberValue = ''
       this.groupNumber = []
@@ -1524,4 +1529,7 @@ export default {
   .el-table .adopt{
     background: limegreen;
   }
+  .el-table .isUrgentItem{
+    background: #ff7575;
+  }
 </style>

src/views/layout/components/Navbar.vue

@@ -30,6 +30,7 @@ import Hamburger from '@/components/Hamburger'
 import { searchTable1 } from '@/api/PurchasingCenter/PurchaseContractApproval'
 import { getMaterial, getMaterial_NOTES, setChakan } from '@/api/PurchasingCenter/MaterialManagement'
 import { initApproval, initApprovalOffline } from '@/api/PurchasingCenter/FundApproval'
+import { searchUrgentItem } from '@/api/ManufacturingCenter/InitialProduction'
 import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/InvoiceSettlementApprove'
 import { searchRequestFund } from '@/api/PurchasingCenter/PurchaseContractRequestFund'
 import { getPickingList, setPickingList } from '@/api/Inventory/MaterialOut'
@@ -47,6 +48,7 @@ export default {
       noticeContract4: null,
       noticeContract5: null,
       noticeContract6: null,
+      noticeContractJJ: null,
       noticeFund: null,
       noticeInvoice: null,
       noticeContractKG: null
@@ -75,6 +77,9 @@ export default {
     } else if (this.token.toString() === '15') {
       this.comfirmMaterial_KG()
       this.timer = setInterval(this.comfirmMaterial_KG, 1000 * 60 * 5)
+    } else if (this.token.toString() === '5') {
+      this.comfirmUrgentItem()
+      this.timer = setInterval(this.comfirmUrgentItem, 1000 * 60)
     }
   },
   beforeDestroy() {
@@ -237,6 +242,22 @@ export default {
         }
       })
     },
+    comfirmUrgentItem() {
+      console.log(1111)
+      searchUrgentItem().then(res => {
+        if (res.data.length > 0) {
+          this.noticeContractJJ = null
+          this.noticeContractJJ = this.$notify.success({
+            title: '提示',
+            message: '您有加急件未打印，请及时处理',
+            onClick: () => {
+              setTimeout(this.noticeContractJJ.close(), 1000)
+            },
+            duration: 1000 * 60
+          })
+        }
+      })
+    },
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
     },