Merge remote-tracking branch 'origin/master'

src/api/production/generateReport.js

@@ -33,6 +33,7 @@ export const continueWork= data => createAPI(`dailyPlan/continueWork`, 'post', d
 export const circulationSchedule= data => createAPI(`dailyPlan/circulationSchedule`, 'post', data);
 
 export const closeSchedule= data => createAPI(`dailyPlan/closeSchedule`, 'post', data);
+export const openSchedule= data => createAPI(`dailyPlan/openSchedule`, 'post', data);
 export const searchLastApproveQty= data => createAPI(`dailyPlan/searchLastApproveQty`, 'post', data);
 
 export const transFerSearch= data => createAPI(`dailyPlan/transFerSearch`, 'post', data);

src/views/modules/production/closeSchedule.vue

@@ -117,6 +117,7 @@
         <template slot-scope="scope" class="foo_container">
           <a v-if="scope.row.circulationSeqNo===null&&scope.row.closedFlag=='N'"  type="text" size="small" @click="circulation(scope.row)">流转</a>
           <a v-if="scope.row.circulationSeqNo===null&&scope.row.closedFlag=='N'"  type="text" size="small" @click="closeSchedule(scope.row)">结束派工单</a>
+          <a v-if="scope.row.circulationSeqNo===null&&scope.row.closedFlag=='Y'"  type="text" size="small" @click="openSchedule(scope.row)">打开派工单</a>
           <a v-if="scope.row.circulationSeqNo!=null" type="text" size="small" >派工单已流转</a>
         </template>
       </el-table-column>
@@ -381,7 +382,7 @@
   import {
     getSOScheduleRoutingData,
     circulationSchedule,
-    closeSchedule
+    closeSchedule,openSchedule
   } from '@/api/production/generateReport.js'
   import Chooselist from '@/views/modules/common/Chooselist'
   export default {
@@ -642,6 +643,30 @@
         })
         })
       },
+      openSchedule(row){
+        this.$confirm(`确定打开此派工单`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          openSchedule(row).then(({data}) => {
+            if (data && data.code === 0) {
+              this.search();
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
       closeSchedule(row){
         this.$confirm(`确定关闭此派工单`, '提示', {
           confirmButtonText: '确定',