Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

package.json

@@ -38,6 +38,7 @@
   "dependencies": {
     "@dhtmlx/trial-vue-gantt": "1.1.0",
     "@riophae/vue-treeselect": "0.4.0",
+    "ant-design-vue": "1.7.8",
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "^3.21.1",
@@ -59,7 +60,9 @@
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
+    "vue-ls": "4.0.0",
     "vue-meta": "2.4.0",
+    "vue-plugin-hiprint": "^0.0.56",
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0"

public/css/print-lock.css

+@media print {
+  body {
+    margin: 0px;
+    padding: 0px;
+  }
+}
+
+@page {
+  margin: 0;
+}
+
+.hiprint-printPaper * {
+  box-sizing: border-box;
+  -moz-box-sizing: border-box; /* Firefox */
+  -webkit-box-sizing: border-box; /* Safari */
+}
+
+.hiprint-printPaper *:focus {
+  outline: -webkit-focus-ring-color auto 0px;
+}
+
+.hiprint-printPaper {
+  position: relative;
+  padding: 0 0 0 0;
+  page-break-after: always;
+  -webkit-user-select: none; /* Chrome/Safari/Opera */
+  -moz-user-select: none; /* Firefox */
+  user-select: none;
+  overflow-x: hidden;
+  overflow: hidden;
+}
+
+.hiprint-printPaper .hiprint-printPaper-content {
+  position: relative;
+}
+
+/* 火狐浏览器打印 第一页过后 重叠问题 */
+@-moz-document url-prefix() {
+  .hiprint-printPaper .hiprint-printPaper-content {
+    position: relative;
+    margin-top: 20px;
+    top: -20px
+  }
+}
+
+.hiprint-printPaper.design {
+  overflow: visible;
+}
+
+
+.hiprint-printTemplate .hiprint-printPanel {
+  page-break-after: always;
+}
+
+.hiprint-printPaper, hiprint-printPanel {
+  box-sizing: border-box;
+  border: 0px;
+}
+
+.hiprint-printPanel .hiprint-printPaper:last-child {
+  page-break-after: avoid;
+}
+
+.hiprint-printTemplate .hiprint-printPanel:last-child {
+  page-break-after: avoid;
+}
+
+.hiprint-printPaper .hideheaderLinetarget {
+  border-top: 0px dashed rgb(201, 190, 190) !important;
+}
+
+.hiprint-printPaper .hidefooterLinetarget {
+  border-top: 0px dashed rgb(201, 190, 190) !important;
+}
+
+.hiprint-printPaper.design {
+  border: 1px dashed rgba(170, 170, 170, 0.7);
+}
+
+.design .hiprint-printElement-table-content, .design .hiprint-printElement-longText-content {
+  overflow: hidden;
+  box-sizing: border-box;
+}
+
+.design .resize-panel {
+  box-sizing: border-box;
+  border: 1px dotted;
+}
+
+.hiprint-printElement-text {
+  background-color: transparent;
+  background-repeat: repeat;
+  padding: 0 0 0 0;
+  border: 0.75pt none rgb(0, 0, 0);
+  direction: ltr;
+  font-family: 'SimSun';
+  font-size: 9pt;
+  font-style: normal;
+  font-weight: normal;
+  padding-bottom: 0pt;
+  padding-left: 0pt;
+  padding-right: 0pt;
+  padding-top: 0pt;
+  text-align: left;
+  text-decoration: none;
+  line-height: 9.75pt;
+  box-sizing: border-box;
+  word-wrap: break-word;
+  word-break: break-all;
+}
+
+.design .hiprint-printElement-text-content {
+  border: 1px dashed rgb(206, 188, 188);
+  box-sizing: border-box;
+}
+
+.hiprint-printElement-longText {
+  background-color: transparent;
+  background-repeat: repeat;
+  border: 0.75pt none rgb(0, 0, 0);
+  direction: ltr;
+  font-family: 'SimSun';
+  font-size: 9pt;
+  font-style: normal;
+  font-weight: normal;
+  padding-bottom: 0pt;
+  padding-left: 0pt;
+  padding-right: 0pt;
+  padding-top: 0pt;
+  text-align: left;
+  text-decoration: none;
+  line-height: 9.75pt;
+  box-sizing: border-box;
+  word-wrap: break-word;
+  word-break: break-all;
+  /*white-space: pre-wrap*/
+}
+
+
+.hiprint-printElement-table {
+  background-color: transparent;
+  background-repeat: repeat;
+  color: rgb(0, 0, 0);
+  border-color: rgb(0, 0, 0);
+  border-style: none;
+  direction: ltr;
+  font-family: 'SimSun';
+  font-size: 9pt;
+  font-style: normal;
+  font-weight: normal;
+  padding-bottom: 0pt;
+  padding-left: 0pt;
+  padding-right: 0pt;
+  padding-top: 0pt;
+  text-align: left;
+  text-decoration: none;
+  padding: 0 0 0 0;
+  box-sizing: border-box;
+  line-height: 9.75pt;
+}
+
+.hiprint-printElement-table thead {
+  background: #e8e8e8;
+  font-weight: 700;
+}
+
+table.hiprint-printElement-tableTarget {
+  width: 100%;
+}
+
+.hiprint-printElement-tableTarget, .hiprint-printElement-tableTarget tr, .hiprint-printElement-tableTarget td {
+  border-color: rgb(0, 0, 0);
+  /*border-style: none;*/
+  /*border: 1px solid rgb(0, 0, 0);*/
+  font-weight: normal;
+  direction: ltr;
+  padding-bottom: 0pt;
+  padding-left: 4pt;
+  padding-right: 4pt;
+  padding-top: 0pt;
+  text-decoration: none;
+  vertical-align: middle;
+  box-sizing: border-box;
+  word-wrap: break-word;
+  word-break: break-all;
+  /*line-height: 9.75pt;
+  font-size: 9pt;*/
+}
+
+.hiprint-printElement-tableTarget-border-all {
+  border: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-none {
+  border: 0px solid;
+}
+.hiprint-printElement-tableTarget-border-lr {
+  border-left: 1px solid;
+  border-right: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-left {
+  border-left: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-right {
+  border-right: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-tb {
+  border-top: 1px solid;
+  border-bottom: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-top {
+  border-top: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-bottom {
+  border-bottom: 1px solid;
+}
+
+.hiprint-printElement-tableTarget-border-td-none td {
+  border: 0px solid;
+}
+.hiprint-printElement-tableTarget-border-td-all td:not(:nth-last-child(-n+2)) {
+  border-right: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-td-all td:last-child {
+  border-left: 1px solid;
+}
+.hiprint-printElement-tableTarget-border-td-all td:last-child:first-child {
+  border-left: none;
+}
+
+/*.hiprint-printElement-tableTarget tr,*/
+.hiprint-printElement-tableTarget td {
+  height: 18pt;
+}
+
+.hiprint-printPaper .hiprint-paperNumber {
+  font-size: 9pt;
+}
+
+.design .hiprint-printElement-table-handle {
+  position: absolute;
+  height: 21pt;
+  width: 21pt;
+  background: red;
+  z-index: 1;
+}
+
+.hiprint-printPaper .hiprint-paperNumber-disabled {
+  float: right !important;
+  right: 0 !important;
+  color: gainsboro !important;
+}
+
+.hiprint-printElement-vline, .hiprint-printElement-hline {
+  border: 0px none rgb(0, 0, 0);
+
+}
+
+.hiprint-printElement-vline {
+  border-left: 0.75pt solid #000;
+  border-right: 0px none rgb(0, 0, 0) !important;
+  border-bottom: 0px none rgb(0, 0, 0) !important;
+  border-top: 0px none rgb(0, 0, 0) !important;
+}
+
+.hiprint-printElement-hline {
+  border-top: 0.75pt solid #000;
+  border-right: 0px none rgb(0, 0, 0) !important;
+  border-bottom: 0px none rgb(0, 0, 0) !important;
+  border-left: 0px none rgb(0, 0, 0) !important;
+}
+
+.hiprint-printElement-oval, .hiprint-printElement-rect {
+  border: 0.75pt solid #000;
+}
+
+.hiprint-text-content-middle {
+}
+
+.hiprint-text-content-middle > div {
+  display: grid;
+  align-items: center;
+}
+
+.hiprint-text-content-bottom {
+}
+
+.hiprint-text-content-bottom > div {
+  display: grid;
+  align-items: flex-end;
+}
+
+.hiprint-text-content-wrap {
+}
+
+.hiprint-text-content-wrap .hiprint-text-content-wrap-nowrap {
+  white-space: nowrap;
+}
+
+.hiprint-text-content-wrap .hiprint-text-content-wrap-clip {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: clip;
+}
+
+.hiprint-text-content-wrap .hiprint-text-content-wrap-ellipsis {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+/*hi-grid-row */
+.hi-grid-row {
+  position: relative;
+  height: auto;
+  margin-right: 0;
+  margin-left: 0;
+  zoom: 1;
+  display: block;
+  box-sizing: border-box;
+}
+
+.hi-grid-row::after, .hi-grid-row::before {
+  display: table;
+  content: '';
+  box-sizing: border-box;
+}
+
+.hi-grid-col {
+  display: block;
+  box-sizing: border-box;
+  position: relative;
+  float: left;
+  flex: 0 0 auto;
+}
+
+.table-grid-row {
+  margin-left: -0pt;
+  margin-right: -0pt;
+}
+
+.tableGridColumnsGutterRow {
+  padding-left: 0pt;
+  padding-right: 0pt;
+}
+
+.hiprint-gridColumnsFooter {
+  text-align: left;
+  clear: both;
+}

public/index.html

@@ -6,6 +6,9 @@
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+  <link rel="stylesheet" type="text/css" media="print" href="./css/print-lock.css">
+
+
   <title><%= webpackConfig.name %></title>
   <!--[if lt IE 11]>
   <script>window.location.href = '/html/ie.html';</script><![endif]-->

src/api/mes/pro/combination.js

+import request from '@/utils/request'
+
+// 查询生产组合单列表
+export function listCombination(query) {
+  return request({
+    url: '/pro/combination/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询生产组合单列表
+export function combList(query) {
+  return request({
+    url: '/pro/combination/combList',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 查询生产组合单详细
+export function getCombination(combinationId) {
+  return request({
+    url: '/pro/combination/' + combinationId,
+    method: 'get'
+  })
+}
+
+// 新增生产组合单
+export function addCombination(data) {
+  return request({
+    url: '/pro/combination',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增生产组合单
+export function batchAddCombination(data) {
+  return request({
+    url: '/pro/combination/batchAdd',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 修改生产组合单
+export function updateCombination(data) {
+  return request({
+    url: '/pro/combination',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除生产组合单
+export function delCombination(combinationId) {
+  return request({
+    url: '/pro/combination/' + combinationId,
+    method: 'delete'
+  })
+}

src/api/mes/pro/request.js

+import request from '@/utils/request'
+
+// 查询领料申请列表
+export function listMaterialRequest(query) {
+  return request({
+    url: '/pro/materialRequest/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询领料申请详细
+export function getMaterialRequest(materialRequestId) {
+  return request({
+    url: '/pro/materialRequest/' + materialRequestId,
+    method: 'get'
+  })
+}
+
+// 新增领料申请
+export function addMaterialRequest(data) {
+  return request({
+    url: '/pro/materialRequest',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改领料申请
+export function updateMaterialRequest(data) {
+  return request({
+    url: '/pro/materialRequest',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除领料申请
+export function delMaterialRequest(materialRequestId) {
+  return request({
+    url: '/pro/materialRequest/' + materialRequestId,
+    method: 'delete'
+  })
+}

src/api/mes/pro/return.js

+import request from '@/utils/request'
+
+// 查询退料申请列表
+export function listMaterialReturn(query) {
+  return request({
+    url: '/pro/materialReturn/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询退料申请详细
+export function getMaterialReturn(materialReturnId) {
+  return request({
+    url: '/pro/materialReturn/' + materialReturnId,
+    method: 'get'
+  })
+}
+
+// 新增退料申请
+export function addMaterialReturn(data) {
+  return request({
+    url: '/pro/materialReturn',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改退料申请
+export function updateMaterialReturn(data) {
+  return request({
+    url: '/pro/materialReturn',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除退料申请
+export function delMaterialReturn(materialReturnId) {
+  return request({
+    url: '/pro/materialReturn/' + materialReturnId,
+    method: 'delete'
+  })
+}

src/api/system/printTemplate.js

+import request from '@/utils/request'
+
+// 查询打印模板配置列表
+export function listPrintTemplate(query) {
+  return request({
+    url: '/system/printTemplate/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询打印模板配置详细
+export function getPrintTemplate(templateId) {
+  return request({
+    url: '/system/printTemplate/' + templateId,
+    method: 'get'
+  })
+}
+
+// 新增打印模板配置
+export function addPrintTemplate(data) {
+  return request({
+    url: '/system/printTemplate',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改打印模板配置
+export function updatePrintTemplate(data) {
+  return request({
+    url: '/system/printTemplate',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除打印模板配置
+export function delPrintTemplate(templateId) {
+  return request({
+    url: '/system/printTemplate/' + templateId,
+    method: 'delete'
+  })
+}

src/api/system/printerConfig.js

+import request from '@/utils/request'
+
+// 查询打印机配置列表
+export function listPrinterConfig(query) {
+  return request({
+    url: '/system/printerConfig/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询打印机配置详细
+export function getPrinterConfig(printerId) {
+  return request({
+    url: '/system/printerConfig/' + printerId,
+    method: 'get'
+  })
+}
+
+// 新增打印机配置
+export function addPrinterConfig(data) {
+  return request({
+    url: '/system/printerConfig',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改打印机配置
+export function updatePrinterConfig(data) {
+  return request({
+    url: '/system/printerConfig',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除打印机配置
+export function delPrinterConfig(printerId) {
+  return request({
+    url: '/system/printerConfig/' + printerId,
+    method: 'delete'
+  })
+}

src/main.js

@@ -5,6 +5,10 @@ import Cookies from 'js-cookie'
 import Element from 'element-ui'
 import './assets/styles/element-variables.scss'
 
+import Antd from 'ant-design-vue';
+import 'ant-design-vue/dist/antd.css';
+Vue.use(Antd);
+
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
 import App from './App'
@@ -91,6 +95,13 @@ DictData.install()
  * Currently MockJs will be used in the production environment,
  * please remove it before going online! ! !
  */
+import Storage from 'vue-ls'
+let options = {
+  namespace: 'hiPrint-',
+  name: 'ls',
+  storage: 'local',
+};
+Vue.use(Storage, options);
 
 Vue.use(Element, {
   size: Cookies.get('size') || 'medium' // set element-ui default size

src/views/mes/qc/abnormal/index.vue

@@ -9,14 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="异常原因" prop="abnormalReason">
+      <!-- <el-form-item label="异常原因" prop="abnormalReason">
         <el-input
           v-model="queryParams.abnormalReason"
           placeholder="请输入异常原因"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

src/views/mes/qc/report/index.vue

@@ -17,10 +17,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工作单元编号" prop="workstationCode">
+      <el-form-item label="工作单元" prop="workstationName">
         <el-input
-          v-model="queryParams.workstationCode"
-          placeholder="请输入工作单元编号"
+          v-model="queryParams.workstationName"
+          placeholder="请输入工作单元"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -34,18 +34,18 @@
         />
       </el-form-item>
       <el-form-item label="异常时间" prop="abnormalTime">
-        <el-date-picker clearable
+        <el-input
           v-model="queryParams.abnormalTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择异常时间">
-        </el-date-picker>
+          placeholder="请输入异常时间"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-      <el-form-item label="单据状态" prop="abnormalStatus">
+      <!-- <el-form-item label="单据状态" prop="abnormalStatus">
         <el-select v-model="queryParams.abnormalStatus" placeholder="请选择单据状态" clearable>
           <el-option label="请选择字典生成" value="" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -103,8 +103,8 @@
       <el-table-column label="编批单号" align="center" prop="batchNumber" />
       <el-table-column label="工序编号" align="center" prop="processCode" />
       <el-table-column label="工序名称" align="center" prop="processName" />
-      <el-table-column label="工作单元编号" align="center" prop="workstationCode" />
-      <el-table-column label="工作单元名称" align="center" prop="workstationName" />
+      <el-table-column label="作业单元" align="center" prop="workstationName" />
+      <!-- <el-table-column label="工作单元名称" align="center" prop="workstationName" /> -->
       <el-table-column label="异常类型" align="center" prop="abnormalType" >
          <template slot-scope="scope">
           <dict-tag :options="dict.type.pc_abnormal_type" :value="scope.row.abnormalType"/>
@@ -176,8 +176,8 @@
         </el-form-item>
           </el-col>
         <el-col :span="12">
-        <el-form-item label="作业单元编号" prop="workstationCode">
-          <el-input v-model="form.workstationCode" placeholder="请输入工作单元编号" />
+        <el-form-item label="作业单元" prop="workstationId">
+          <el-input v-model="form.workstationId" placeholder="请输入工作单元" />
         </el-form-item>
         </el-col>
         </el-row>
@@ -267,7 +267,17 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        batchNumber: null,        processId: null,        processCode: null,        processName: null,        workstationId: null,        workstationCode: null,        workstationName: null,        abnormalType: null,        abnormalReason: null,        abnormalTime: null,        abnormalStatus: null,      },
+        batchNumber: null,        
+        processId: null,        
+        processCode: null,        
+        processName: null,        
+        workstationId: null,        
+        workstationCode: null,       
+        workstationName: null,        
+        abnormalType: null,        
+        abnormalReason: null,        
+        abnormalTime: null,        
+        abnormalStatus: null,      },
       // 表单参数
       form: {},
       // 表单校验
@@ -296,7 +306,22 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        abnormalReportId: null,        batchNumber: null,        processId: null,        processCode: null,        processName: null,        workstationId: null,        workstationCode: null,        workstationName: null,        abnormalType: null,        abnormalReason: null,        abnormalTime: null,        abnormalStatus: null,        createBy: null,        createTime: null,        updateBy: null,        updateTime: null      };
+        abnormalReportId: null,        
+        batchNumber: null,        
+        processId: null,        
+        processCode: null,        
+        processName: null,        
+        workstationId: null,        
+        workstationCode: null,        
+        workstationName: null,        
+        abnormalType: null,        
+        abnormalReason: null,        
+        abnormalTime: null,        
+        abnormalStatus: null,        
+        createBy: null,        
+        createTime: null,        
+        updateBy: null,        
+        updateTime: null      };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */

src/views/mes/tm/tool/index.vue

@@ -143,7 +143,7 @@
       <el-table-column label="品牌" width="80" align="center" prop="brand" :show-overflow-tooltip="true"/>
       <el-table-column label="型号" width="80" align="center" prop="spec" :show-overflow-tooltip="true"/>
       <el-table-column label="类型" width="80" align="center" prop="toolTypeName" />
-      <el-table-column label="库存数量" width="100" align="center" prop="quantity" />
+      <el-table-column label="可用数量" width="100" align="center" prop="quantityAvail" />
      
       <el-table-column label="保养维护类型" width="120" align="center" prop="maintenType">
         <template slot-scope="scope">
@@ -236,7 +236,7 @@
         <el-row>
            <el-col :span="12">
             <el-form-item label="工装夹具名称" prop="toolName">
-              <el-input v-model="form.toolName" placeholder="请输入工装夹具名称" />
+              <el-input v-model="form.toolName" readonly />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -253,17 +253,25 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="型号" prop="spec">
-              <el-input v-model="form.spec" placeholder="请输入型号" />
+              <el-input v-model="form.spec" readonly />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
-            <el-form-item  label="SN码" prop="toolCode">
+          <el-col :span="12">
+            <!-- <el-form-item  label="SN码" prop="toolCode">
               <el-input v-model="form.toolCode" placeholder="请输入SN码" />
+            </el-form-item> -->
+             <el-form-item prop="toolCode">
+              <template slot="label"> SN码 </template>
+              <el-input
+                disabled
+                v-model="form.toolCode"
+                placeholder="自动生成"
+              ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <!-- <el-col :span="4">
             <el-form-item  label-width="80">
               <el-switch v-model="autoGenFlag"
                   active-color="#13ce66"
@@ -271,7 +279,7 @@
                   @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
               </el-switch>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item  label="数量" prop="quantity">
               <!-- <el-input v-if="form.codeFlag=='Y'" readonly v-model="form.quantity" /> -->
@@ -428,6 +436,9 @@ export default {
   created() {
     this.getList();
     this.getTypeList();
+    if (this.mode == "add") {
+      this.gCode();
+    }
   },
   methods: {
     /** 查询工装夹具清单列表 */
@@ -477,6 +488,7 @@ export default {
       };
       this.autoGenFlag = false;
       this.resetForm("form");
+      this.gCode();
     },
     onToolTypeChanged(){
       var types = this.toolTypeOptions.filter((item) =>{
@@ -579,16 +591,24 @@ export default {
         ...this.queryParams
       }, `tool_${new Date().getTime()}.xlsx`)
     },
+    // //自动生成编码
+    // handleAutoGenChange(autoGenFlag){
+    //   debugger;
+    //   if(autoGenFlag){
+    //     genCode('TOOL_CODE').then(response =>{
+    //       this.form.toolCode = response;
+    //     });
+    //   }else{
+    //     this.form.toolCode = null;
+    //   }
+    // },
+
+
     //自动生成编码
-    handleAutoGenChange(autoGenFlag){
-      debugger;
-      if(autoGenFlag){
-        genCode('TOOL_CODE').then(response =>{
+     gCode() {
+      genCode("TOOL_CODE").then((response) => {
         this.form.toolCode = response;
       });
-      }else{
-        this.form.toolCode = null;
-      }
     },
     handleBrandSelect(){
       this.$refs.brSelect.showFlag = true;

src/views/mes/tm/toolrequest/index.vue

@@ -141,7 +141,7 @@
           <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="申请数量" align="center" prop="requestNum" />
+      <el-table-column label="总数量" align="center" prop="requestNum" />
       <!-- <el-table-column label="编排单号" align="center" prop="arrangeCode" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -233,8 +233,8 @@
         </el-form-item>
         </el-col>
 <el-col :span="8">
-        <el-form-item label="申请数量" prop="requestNum">
-          <el-input v-model="form.requestNum" placeholder="请输入申请数量" />
+        <el-form-item label="总数量" prop="requestNum">
+          <el-input v-model="form.requestNum" placeholder="请输入总数量" />
         </el-form-item>
                 </el-col>
         </el-row>

src/views/mes/tm/toolrequest/itemIndex.vue

@@ -4,8 +4,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键id" align="center" prop="toolRequestItemId" />
       <el-table-column label="刀模板申请单id" align="center" prop="toolRequestId" /> -->
-      <el-table-column label="物料名称" align="center" prop="itemName" />
-      <el-table-column label="总数量" align="center" prop="allQuantity" />
+      <el-table-column label="刀模板物料名称" align="center" prop="itemName" />
+      <el-table-column label="数量" align="center" prop="allQuantity" />
       <el-table-column label="预计使用寿命" align="center" prop="nextMaintenPeriod" />
     </el-table>
     
@@ -26,7 +26,7 @@
         <el-form-item label="物料id" prop="itemId">
           <el-input v-model="form.itemId" placeholder="请输入物料id" />
         </el-form-item>
-        <el-form-item label="总数量" prop="allQuantity">
+        <el-form-item label="数量" prop="allQuantity">
           <el-input v-model="form.allQuantity" placeholder="请输入总数量" />
         </el-form-item>
         <el-form-item label="预计使用寿命" prop="nextMaintenPeriod">
@@ -46,6 +46,12 @@ import { listTmToolRequestItem, getTmToolRequestItem, delTmToolRequestItem, addT
 
 export default {
   name: "TmToolRequestItem",
+  props:{
+    toolRequestId:{
+      type:String,
+      default:''
+    }
+  },
   data() {
     return {
       // 遮罩层
@@ -85,6 +91,7 @@ export default {
     /** 查询刀模板物料申请单列表 */
     getList() {
       this.loading = true;
+      this.queryParams.toolRequestId = this.toolRequestId;
       listTmToolRequestItem(this.queryParams).then(response => {
         this.tmToolRequestItemList = response.rows;
         this.total = response.total;