排产结果接口变化

pages/aps/results/api.js

@@ -14,7 +14,13 @@ export default {
     getdetail(params) {
         return Api.get(`${apsUrl}/scheduletotal/getdetail`, params);
     },
-    processschemedispatch(params) {
+    processschemedispatch(params) { //插单检查后，“否”不操作，“是”：如果result.retcode=1,调用：
         return Api.post(`${apsUrl}/apspoolappservices/processschemedispatch`, params);
     },
+    checkisinsertandbadjust(params) { //点击下发是调用接口；方案下发前的插单检查，返回后弹框，提示内容未result.retmsg
+        return Api.post(`${apsUrl}/apspoolappservices/checkisinsertandbadjust`, params);
+    },
+    processschemedispatchinsert(params) { //排产方案下发--普通+干扰；如果result.retcode=0,调用：
+        return Api.post(`${apsUrl}/apspoolappservices/processschemedispatch_insert`, params);
+    },
 }

pages/aps/results/index.vue

 <style lang="less">
-@import './results.less';
+@import "./results.less";
 </style>
 <template>
   <div class="results">
@@ -29,24 +29,24 @@
         </div>
       </Sider>
       <Content class="tab_card_box">
-        <Tabs class="tab_card" value="name1" type="card" :animated="false">
-            <TabPane label="结果列表" name="name1">
-              <resultsList ref="resultsList"/>
-            </TabPane>
-            <!-- <TabPane label="结果甘特图" name="name2">结果甘特图</TabPane> -->
-            <TabPane label="方案对比" name="name3">
-              <compareList ref="compareList"/>
-            </TabPane>
+        <Tabs class="tab_card" v-model="name" type="card" :animated="false" @on-click="clickTab">
+          <TabPane label="结果列表" name="name1">
+            <resultsList ref="resultsLists" />
+          </TabPane>
+          <!-- <TabPane label="结果甘特图" name="name2">结果甘特图</TabPane> -->
+          <TabPane label="方案对比" name="name3">
+            <compareList ref="compareList" />
+          </TabPane>
         </Tabs>
         <!-- <h4>排产结果</h4>
         <div class="btn">
-          <Button type="primary" @click="parameter">下发</Button> -->
-          <!-- <Button type="primary">导出</Button>000 -->
-          <!-- <Button type="primary" icon="ios-redo" @click="comeBlck">返回</Button>
+        <Button type="primary" @click="parameter">下发</Button>-->
+        <!-- <Button type="primary">导出</Button>000 -->
+        <!-- <Button type="primary" icon="ios-redo" @click="comeBlck">返回</Button>
         </div>
         <div>
           <Table :columns="columns" :data="data"></Table>
-        </div> -->
+        </div>-->
       </Content>
     </Layout>
   </div>
@@ -58,14 +58,15 @@ import resultsList from "./result.vue";
 import compareList from "./compare.vue";
 
 export default {
-  components: { resultsList,compareList },
+  components: { resultsList, compareList },
 
   data() {
     return {
       isactive: 0,
       data: [],
       list: [],
-      id: "",
+      name:'name1',
+      id: ""
       // columns: [
       //   {
       //     type: "expand",
@@ -150,6 +151,8 @@ export default {
     this.orderlist();
   },
   methods: {
+    clickTab(name) {
+    },
     orderlist() {
       Api.getall()
         .then(r => {

pages/aps/results/result.vue

 <style lang="less">
-@import './results.less';
+@import "./results.less";
 </style>
 <template>
-<div>
+  <div>
     <div class="btn" style="z-index:9999;position:absolute;right:0">
-        <Button type="primary" @click="parameter">下发</Button>
-          <!-- <Button type="primary">导出</Button>000 -->
-        <Button type="primary" icon="ios-redo" @click="comeBlck">返回</Button>
+      <Button type="primary" @click="parameter" v-show="showNext">下发</Button>
+      <!-- <Button type="primary">导出</Button>000 -->
+      <Button type="primary" icon="ios-redo" @click="comeBlck">返回</Button>
     </div>
     <div>
-        <Table :columns="columns" :data="data"></Table>
+      <Table :columns="columns" :data="data"></Table>
     </div>
-</div>
+  </div>
 </template>
 <script>
 import Api from "./api";
 import expandRow from "./table-expand.vue";
 export default {
-   components: { expandRow },
+  components: { expandRow },
   data() {
     return {
       isactive: 0,
       data: [],
       list: [],
+      showNext: true,
       columns: [
         {
           type: "expand",
@@ -97,11 +98,11 @@ export default {
           key: "plan_qty",
           align: "center"
         }
-      ],
-    }
+      ]
+    };
   },
   async fetch({ store, params }) {
-    await store.dispatch('loadDictionary') // 加载数据字典
+    await store.dispatch("loadDictionary"); // 加载数据字典
   },
   components: {},
   created() {
@@ -140,14 +141,49 @@ export default {
     },
     // 下发
     parameter() {
-      Api.processschemedispatch({
+      Api.checkisinsertandbadjust({
+        //方案下发前的插单检查
         id: this.id
       }).then(r => {
         if (r.result) {
-          this.$Message.success(r.result.retmsg);
-          this.orderlist();
+          this.$Modal.confirm({
+            title: "结果下发",
+            content: r.result.retmsg,
+            onOk: () => {
+              if (r.result.retcode == 1) {
+                //排产方案下发--普通+干扰
+                Api.processschemedispatch({
+                  id: this.id
+                }).then(r => {
+                  if (r.result) {
+                    this.$Message.success(r.result.retmsg);
+                    this.orderlist();
+                  } else {
+                    this.$Message.error("下发失败");
+                  }
+                });
+              } else if (r.result.retcode == 0) {
+                //排产方案下发--有插单
+                Api.processschemedispatchinsert({
+                  id: this.id
+                }).then(r => {
+                  if (r.result) {
+                    this.$Message.success(r.result.retmsg);
+                    this.orderlist();
+                  } else {
+                    this.$Message.error("下发失败");
+                  }
+                });
+              } else {
+                this.$Message.error("下发失败");
+              }
+            },
+            onCancel: () => {
+              this.$Message.info("取消下发");
+            }
+          });
         } else {
-          this.$Message.success("下发失败");
+          this.$Message.info("不能下发");
         }
       });
     },
@@ -156,16 +192,15 @@ export default {
       this.$router.push({ path: "/aps/aps" });
     },
     tabChange(name) {
-     if(name=='technicalcoordination')
-     {
-       this.$refs.technicalcoordination.loadchangelist();
-     }
-    if(name=='unqualifiedorder'){
-          this.$refs.unqualifiedorder.loadchangelist();
+      if (name == "technicalcoordination") {
+        this.$refs.technicalcoordination.loadchangelist();
       }
-    },
+      if (name == "unqualifiedorder") {
+        this.$refs.unqualifiedorder.loadchangelist();
+      }
+    }
   }
-}
+};
 </script>
 <style lang="less">
 </style>