刀模版版具管理

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

@@ -137,7 +137,6 @@
       <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="quantityAvail" />
-
       <el-table-column label="保养维护类型" width="120" align="center" prop="maintenType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mes_mainten_type" :value="scope.row.maintenType"/>
@@ -149,6 +148,7 @@
           <span>{{ parseTime(scope.row.nextMaintenDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="位置" width="80" align="center" prop="location" :show-overflow-tooltip="true"/>
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mes_tool_status" :value="scope.row.status"/>

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

@@ -113,6 +113,10 @@
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="上下机编码" min-width="150" align="center" prop="toolMachinesCode" />
       <el-table-column label="申请单编码" min-width="130" align="center" prop="toolRequestCode" />
+      <el-table-column label="领用单编码" min-width="150" align="center" prop="toolRequestUseCode" />
+      <el-table-column label="编排单号" align="center"  prop="arrangeCode"/>
+      <el-table-column label="工序任务编码" width="120" align="center" prop="taskCode" />
+      <el-table-column label="工作单元名称" min-width="100" align="center" prop="workunitName" />
       <el-table-column label="上机状态" align="center" prop="typeName" width="120"/>
       <el-table-column label="是否入库" align="center" prop="warehouse" width="180">
         <!-- # 1 未入库,2 已入库 -->
@@ -127,10 +131,6 @@
       <el-table-column label="物料编码" width="150" align="center" prop="sapItemCode" />
       <el-table-column label="台账编码" width="180" align="center" prop="toolCode" />
       <el-table-column label="台账名称" width="180" align="center" prop="toolName" />
-      <el-table-column label="领用单编码" min-width="150" align="center" prop="toolRequestUseCode" />
-      <el-table-column label="工序任务编码" width="120" align="center" prop="taskCode" />
-      <el-table-column label="工作单元名称" min-width="100" align="center" prop="workunitName" />
-      <el-table-column label="工作单元编码" min-width="100" align="center" prop="workunitCode" />
 
       <!-- <el-table-column label="操作" align="center" width="100" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">

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

@@ -11,16 +11,9 @@
     <ItemSelect 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 label="主键id" align="center" prop="toolRequestItemId" />
-      <el-table-column label="刀模版申请单id" align="center" prop="toolRequestId" /> -->
+      <!-- <el-table-column label="主键id" align="center" prop="toolRequestItemId" /> -->
+      <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="刀模版物料名称" align="center" prop="itemName" />
-
-      <el-table-column width="120px" v-if="$attrs.optType === 'add'" label="数量" align="center" prop="quantity" >
-         <template slot-scope="scope">
-            <el-input v-model="scope.row.quantity" @blur="$emit('sum')" placeholder="请输入数量" />
-         </template>
-      </el-table-column>
-      <el-table-column  width="120px" v-else label="数量" align="center" prop="quantity" />
       <el-table-column  width="120px" label="预计使用寿命" align="center" prop="estimatedLifeTime" />
       <el-table-column width="100px" v-if="$attrs.optType === 'add'" label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -64,6 +57,17 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="输入物料数量" :visible.sync="quantity.open" width="500px" append-to-body>
+      <el-form>
+        <el-form-item label="物料数量" prop="allQuantity">
+          <el-input-number v-model="quantity.value" placeholder="请输入物料数量" :min="1"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitQuantity">确 定</el-button>
+        <el-button @click="quantity.open=false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -110,6 +114,11 @@ export default {
       // 表单校验
       rules: {
       },
+      quantity: {
+        value: 1,
+        open: false,
+        list: []
+      },
       addList: [],
       detailList: []
     };
@@ -129,15 +138,25 @@ export default {
   methods: {
     onItemSelect(list){
       // console.log(list, 'list')
-      this.addList = list.map(item => {
-        return {
-          itemId:item.itemId,
-          itemName:item.itemName,
-          quantity: 1,
-          estimatedLifeTime: Number(this.$attrs.quantity) || 0
+      this.quantity = {
+        open: true,
+        value: 1,
+        list: list
+      }
+    },
+    submitQuantity(){
+      this.addList = []
+      this.quantity.list.forEach(item => {
+        for(let i = 0; i < this.quantity.value; i++){
+          this.addList.push({
+            itemId:item.itemId,
+            itemName:item.itemName,
+            estimatedLifeTime: Number(this.$attrs.quantity) || 0
+          })
         }
       })
-      this.tmToolRequestItemList = this.detailList.concat(this.addList)
+      this.tmToolRequestItemList = this.tmToolRequestItemList.concat(JSON.parse(JSON.stringify(this.addList)))
+      this.quantity.open = false
       this.$emit('sum')
     },
     /** 查询刀模版物料申请单列表 */
@@ -176,8 +195,7 @@ export default {
     },
     handleRemove(row, index) {
       console.log(row,index)
-      // this.tags.splice(this.tags.indexOf(tag), 1)
-      this.tmToolRequestItemList.splice(this.tmToolRequestItemList.indexOf(row), 1)
+      this.tmToolRequestItemList.splice(index, 1)
       this.$emit('sum')
     },
     // 取消按钮

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

@@ -39,10 +39,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="物料编码" width="130" align="center" prop="sapItemCode" />
       <el-table-column label="物料名称" width="100" align="center" prop="itemName" />
-      <el-table-column label="工作单元编码" min-width="100" align="center" prop="workunitCode" />
+      <el-table-column label="申请单编码" min-width="130" align="center" prop="toolRequestCode" />
+      <el-table-column label="领用单编码" min-width="150" align="center" prop="toolRequestUseCode" />
+      <el-table-column label="编排单号" align="center"  prop="arrangeCode"/>
+      <el-table-column label="工序任务编码" width="120" align="center" prop="taskCode" />
       <el-table-column label="工作单元名称" min-width="120" align="center" prop="workunitName" />
       <el-table-column label="任务编码" width="120" align="center" prop="taskCode" />
-      <el-table-column label="任务名称" show-overflow-tooltip min-width="220" align="center" prop="taskName" />
       <el-table-column label="上机状态" width="100" align="center" prop="typeName" />
       <el-table-column label="数量" width="80" align="center" prop="allQuantity" />
       <el-table-column label="使用寿命" width="80" align="center" prop="nextMaintenPeriod" />

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

@@ -316,6 +316,7 @@
 
           </template>
         </el-table-column>
+        <el-table-column label="领用位置" prop="location" />
         <el-table-column label="剩余寿命" prop="lifeTime" />
       </el-table>
       <SelectSn ref="selectSnRef" :data="tmToolRequestList" :id="currentInfo.itemId" @onSelected="onSelectSn" />

src/views/mes/tm/toolrequestuse/selectSn.vue

@@ -44,7 +44,7 @@
       <el-table-column label="SN号" align="center" prop="toolCode" />
       <el-table-column label="剩余寿命" align="center" prop="lifeTime" />
       <!-- <el-table-column label="型号" align="center" prop="spec" /> -->
-      <el-table-column label="物料类型" align="center" prop="toolTypeName" />
+      <el-table-column label="位置" align="center" prop="location" />
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag