生产查询

src/api/base/site.js

@@ -105,6 +105,8 @@ export const deleteCompanyInformation = data => createAPI(`/base/deleteCompanyIn
 //------------维护工艺路线----------------
 //维护工艺路线
 export const searchRoutingWithPartNo= data => createAPI(`/base/searchRoutingWithPartNo`,'post',data)
+//维护工艺路线
+export const searchBomWithPartNo= data => createAPI(`/base/searchBomWithPartNo`,'post',data)
 //工艺路线明细
 export const searchRoutingDetailData= data => createAPI(`/base/searchRoutingDetailData`,'post',data)
 //保存工艺路线

src/api/shopOrder/shopOrder.js

@@ -95,6 +95,7 @@ export const deleteShopOrderToolData = data => createAPI('/shopOrder/deleteShopO
 
 // 更改生产工单工艺路线
 export const shopOrderUpdateRoutingViaRev = data => createAPI('/shopOrder/shopOrderUpdateRoutingViaRev', 'post', data)
+export const shopOrderUpdateBomViaRev = data => createAPI('/shopOrder/shopOrderUpdateBomViaRev', 'post', data)
 
 // 查询生产通知单信息
 export const shopNoticeSearch = data => createAPI('/shopOrder/shopNoticeSearch', 'post', data)

src/views/common/theme.vue

@@ -14,7 +14,7 @@
       </el-radio-group>
     </el-form-item>
     <el-form-item label="特效" >
-      <el-radio-group v-model="effectsEnabled" v-if="false">
+      <el-radio-group v-model="effectsEnabled" >
         <el-radio label="Y" border>开启</el-radio>
         <el-radio label="N" border>关闭</el-radio>
       </el-radio-group>

src/views/modules/print/rePrintPoPart.vue

@@ -89,7 +89,16 @@
 <!--      </el-table-column>-->
 
     </el-table>
-
+    <el-pagination
+      style="margin-top: 0px"
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 200, 500]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
     <el-dialog title="补打标签" :close-on-click-modal="false" v-drag :visible.sync="addModelFlag" width="300px">
       <el-form :model="addModelData" label-position="top" style="margin-top: -5px;">
         <el-row :gutter="20">
@@ -408,7 +417,7 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      this.height = window.innerHeight - 160;
+      this.height = window.innerHeight - 220;
     })
 
   },
@@ -446,6 +455,16 @@ export default {
         this.dataListLoading = false
       })
     },
+    // 分页处理
+    sizeChangeHandle(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getMainData()
+    },
+    currentChangeHandle(val) {
+      this.pageIndex = val
+      this.getMainData()
+    },
     printLabelModel(){
       if(this.selectionDataList.length===0){
         this.$message.error('未选择标签！');

src/views/modules/shopOrder/shopOrder/searchShopOrder.vue

@@ -80,13 +80,13 @@
       <el-form-item :label=labels.status>
         <el-select filterable v-model="searchData.status" style="width: 130px" placeholder="请选择状态">
           <el-option :label=labels.allSelectLabel value=""></el-option>
-          <el-option :label=labels.stoppedLabel value="已停工"></el-option>
-          <el-option :label=labels.startedLabel value="已开工"></el-option>
-          <el-option :label=labels.canceledLabel value="已取消"></el-option>
           <el-option :label=labels.planedLabel value="已计划"></el-option>
-          <el-option :label=labels.scheduledLabel value="已排产"></el-option>
           <el-option :label=labels.releasedLabel value="已下达"></el-option>
+          <el-option :label=labels.scheduledLabel value="已排产"></el-option>
+          <el-option :label=labels.startedLabel value="已开工"></el-option>
+          <el-option :label=labels.stoppedLabel value="已停工"></el-option>
           <el-option :label=labels.closedLabel value="已关闭"></el-option>
+          <el-option :label=labels.canceledLabel value="已取消"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label=labels.shopOrder>