update:修改入库加查询和工装台账打印二维码规则

src/api/mes/tm/warehouse.js

@@ -12,8 +12,9 @@ export function lisWoreHouse(query) {
 // 查询刀模版入库详情列表
 export function lisWoreHouseDetail(query) {
   return request({
-    url: `/md/warehouse/${query.toolWarehouseid}`,
-    method: "get"
+    url: `/md/warehouse/item/list`,
+    method: "get",
+    params: query,
   });
 }
 

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

@@ -136,7 +136,7 @@
 
     <el-table v-loading="loading" :data="toolList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-       <el-table-column label="物料编码" width="80" align="center" prop="itemCode" />
+       <el-table-column label="物料编码" width="120" :show-overflow-tooltip="true" align="center" prop="itemCode" />
        <el-table-column label="名称" min-width="180" align="center" prop="toolName" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <el-button
@@ -608,7 +608,7 @@ export default {
     printQrCode() {
       const qrArr = [];
       this.selectRow.forEach(s=>{
-        qrArr.push({"qrcode": s.itemCode + s.toolCode});
+        qrArr.push({"qrcode": s.itemCode +'-'+ s.toolCode});
       });
       postPrintPdf({
         "reportName":"mysql:qrcode-100*100",

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

@@ -51,39 +51,6 @@
           v-hasPermi="['tm:toolmachinesrecord:add']"
         >新增</el-button>
       </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['tm:toolmachinesrecord:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['tm:toolmachinesrecord:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['tm:toolmachinesrecord:export']"
-        >导出</el-button>
-      </el-col> -->
-      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
     <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
@@ -93,6 +60,17 @@
       <el-table-column label="更新人" align="center" prop="updateBy"/>
       <el-table-column label="创建时间" align="center" prop="createTime"/>
       <el-table-column label="更新时间" align="center" prop="updateTime"/>
+      <el-table-column label="操作" align="center" width="100" fixed="right" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['tm:toolmachinesrecord:edit']"
+          >详情</el-button>
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -103,7 +81,7 @@
       @pagination="getList"
     />
 
-    <!-- 入库对话框 -->
+    <!-- 新增和详情对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="950px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
@@ -116,10 +94,10 @@
       </el-form>
       <el-divider content-position="center">入库申请详细</el-divider>
       <el-card shadow="always" class="box-card">
-        <itemline ref="line" :quantity="form.requestNum" :toolRequestId="form.toolRequestId" :optType="optType"></itemline>
+        <itemline v-if="open" ref="line" :quantity="form.requestNum" :id="form.toolWarehouseId" :optType="optType"></itemline>
       </el-card>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button v-if="optType !== 'view'" type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -264,7 +242,8 @@ export default {
       this.reset();
       this.form = Object.assign(row, {})
       this.open = true;
-      this.title = "申请入库";
+      this.optType = 'view'
+      this.title = "详情";
     },
     /** 提交按钮 */
     submitForm() {

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

@@ -8,11 +8,12 @@
       size="mini"
       @click="$refs['ItemSelectRef'].showFlag = true"
     >新增</el-button>
-    <ItemSelect ref="ItemSelectRef" @onSelected="onItemSelect" />
+    <ItemSelect v-if="$attrs.optType === 'add'" ref="ItemSelectRef" @onSelected="onItemSelect" />
     <el-table v-loading="loading" :data="tmToolRequestItemList" @selection-change="handleSelectionChange">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column
       type="index"
+      label="序号"
       width="50"/>
       <el-table-column label="物料编码" align="center" prop="itemCode" />
       <el-table-column  width="100px" label="物料名称" align="center" prop="itemName" />
@@ -56,7 +57,7 @@
 </template>
 
 <script>
-import { lisWoreHouseDetail, getTmToolRequestItem, delTmToolRequestItem, addTmToolRequestItem, updateTmToolRequestItem } from "@/api/mes/tm/tmToolRequestItem";
+import { lisWoreHouseDetail } from "@/api/mes/tm/warehouse";
 import { getTaskIdMaxProcessTool } from "@/api/mes/pro/protask";
 import ItemSelect from "./selectmachinesrecord.vue";
 export default {
@@ -66,7 +67,7 @@ export default {
   ],
   components: {ItemSelect},
   props:{
-    toolRequestId:{
+    id:{
       type:String,
       default:''
     }
@@ -94,8 +95,8 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
-        toolRequestId: null,        itemId: null,        allQuantity: null,        nextMaintenPeriod: null,      },
+        pageSize: 10
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -139,8 +140,9 @@ export default {
     },
     /** 查询刀模板物料申请单列表 */
     getList() {
+      console.log(this.id, 'ids')
       this.loading = true;
-      this.queryParams.toolWarehouseid = this.toolRequestId;
+      this.queryParams.toolWarehouseId = this.id;
       lisWoreHouseDetail(this.queryParams).then(response => {
         this.tmToolRequestItemList = response.rows;
         this.total = response.total;