物料

src/api/material.js

@@ -36,9 +36,9 @@ export function changeStaStatus(data) {
 
 // 修改物料表
 export function updateMaterial(data) {
-  const businessId = data.businessId
+  // const businessId = data.businessId
   return request({
-    url: '/nltifsmaterial/update/' + businessId,
+    url: '/nltifsmaterial/update',
     method: 'put',
     data,
     headers: {

src/views/ProductionProcess/workOrder.vue

@@ -287,6 +287,13 @@
                 </template>
               </el-table-column>
             </el-table>
+            <pagination
+              v-show="total1>0"
+              :total="total1"
+              :page.sync="rowsBom.page"
+              :limit.sync="rowsBom.rows"
+              @pagination="handleDetail"
+            />
           </el-tab-pane>
           <el-tab-pane label="工站信息">
             <el-table
@@ -424,6 +431,8 @@ export default {
       ],
       // 表格分页总数
       total: 0,
+      // 表格分页总数2
+      total1: 0,
       // 对话框打开标志
       open: false,
       // 对话框表单数据
@@ -433,7 +442,15 @@ export default {
       // 工站表格数据
       stationList: [],
       // 开工表格数据
-      lineList: []
+      lineList: [],
+      // 详情数据
+      rowsBom: {
+        // 表格页码标志
+        page: 1,
+        rows: 10,
+        orderNo: undefined,
+        contract: undefined
+      },
     }
   },
   /** 路由离开前存储筛选条件*/
@@ -476,8 +493,19 @@ export default {
         this.form = response.data
         this.open = true
       })
-      listOrderMater({ bomId: row.bomId }).then(response => {
+      console.log(row)
+      let temp = JSON.parse(JSON.stringify(row.orderNo))
+      this.rows.orderNo = temp
+      let temp1 = JSON.parse(JSON.stringify(row.contract))
+      this.rows.contract = temp1
+      this.getBomTable()
+    },
+    /** 查询工单BOM数据 */
+    getBomTable() {
+      this.Loading1 = true
+      listOrderMater(this.rowsBom).then(response => {
         this.bomList = response.rows
+        this.total1 = response.total
         this.Loading1 = false
       })
     },

src/views/productionInfo/MaterialFile.vue

@@ -199,7 +199,7 @@
                   <div slot="label" class="labelClass">
                     <div class="labelName">分组</div>
                   </div>
-                  <el-select v-model.trim="item.group" placeholder="请选择">
+                  <el-select v-model.trim="item.editGroup" placeholder="请选择">
                     <el-option
                       v-for="item in options"
                       :key="item.value"
@@ -480,7 +480,7 @@ export default {
     },
     // 删除SN规则方法
     delSNRules(item, index) {
-      this.snRulesList.splice(index, 1)
+      this.form.nltMaterialEditList.splice(index, 1)
     },
     // 删除SN规则方法2
     delSNRule(item, index1) {
@@ -500,7 +500,6 @@ export default {
           }
         ]
       }
-      this.snRulesList = []
       this.resetForm('form','form1','form2')
     },
   }