Merge remote-tracking branch 'origin/master'

hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductPlanMapper.xml

@@ -364,7 +364,7 @@
             <if test="planStatus != null  and planStatus != ''">and mpp.plan_status = #{planStatus}</if>
             <if test="incompleteFlag != null  and incompleteFlag != ''">and mpp.plan_status in ('1','2')</if>
         </where>
-        order by mpp.plan_id desc
+        order by mpp.plan_status, mpp.plan_id desc
     </select>
 
 

hw-ui/src/views/board/fifthFloor/index.vue

@@ -96,7 +96,7 @@
           <el-button size="mini" v-if="form.planDetailStatus === '暂停' && form.planDetailCode" type="primary"
                      @click="submitProductPlanDetailContinue" :loading="submitLoading">继续
           </el-button>
-
+          <el-button type="success" @click="showFinish">{{ showTitle }}完工</el-button>
           <el-popover
             v-if="($route.query && $route.query.id) === '1'"
             v-model="assignModel"
@@ -861,7 +861,9 @@ export default {
       },
 
       rawOutstockData:[],
-      purchaseOrderData:[]
+      purchaseOrderData:[],
+      IS_SHOW_FINISH: "1",
+      showTitle: "显示"
 
     }
   },
@@ -894,7 +896,7 @@ export default {
   methods: {
     getProductPlans() {
       this.loading = true
-      getProductPlans({pageNum: this.nowNum1, pageSize: 5}).then(e => {
+      getProductPlans({pageNum: this.nowNum1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(e => {
         this.tableData = e.rows
         this.totalNum1 = Math.ceil(e.total / 5)
         this.tableClick(e.rows[0])
@@ -1081,14 +1083,14 @@ export default {
     },
     next1() {
       this.nowNum1 += 1
-      getProductPlans({pageNum: this.nowNum1, pageSize: 5}).then(e => {
+      getProductPlans({pageNum: this.nowNum1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(e => {
         this.tableData = e.rows
         this.totalNum1 = Math.ceil(e.total / 5)
       })
     },
     pre1() {
       this.nowNum1 -= 1
-      getProductPlans({pageNum: this.nowNum1, pageSize: 5}).then(e => {
+      getProductPlans({pageNum: this.nowNum1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(e => {
         this.tableData = e.rows
         this.totalNum1 = Math.ceil(e.total / 5)
       })
@@ -2045,7 +2047,21 @@ export default {
         });
       }
 
-    }
+    },
+
+    showFinish() {
+      if (this.IS_SHOW_FINISH === "1"){
+        this.showTitle = "隐藏";
+        this.IS_SHOW_FINISH = "";
+      } else {
+        this.showTitle = "显示";
+        this.IS_SHOW_FINISH = "1";
+      }
+      getProductPlans({pageNum: this.nowNum1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(e => {
+        this.tableData = e.rows
+        this.totalNum1 = Math.ceil(e.total / 5)
+      })
+    },
 
   }
 }