aps/plan/order

components/customTable/customTable.vue

@@ -128,7 +128,7 @@
       ok-text="确定"
       cancel-text="取消"
     >
-      {{ metCodesStrTxt }}
+      <p style="word-break:break-all;word-wrap:break-word;">{{ metCodesStrTxt }}</p>
       <div slot="footer">
         <Button @click="ModalInfo = false">取消</Button>
         <Button type="primary" @click="modalInfoOk">确定</Button>

pages/aps/aps/index.vue

@@ -150,7 +150,7 @@ export default {
           title: this.l("mes_code"),
           align: "left",
           high: true,
-           width: 240,
+          width: 240
         },
         {
           key: "product_name",
@@ -182,7 +182,7 @@ export default {
           align: "left",
           high: true,
           code: "plan.order.urgencyLevel",
-          width: 100,
+          width: 100
         },
         {
           key: "priority",
@@ -199,7 +199,7 @@ export default {
           title: this.l("plan_qty"),
           align: "right",
           width: 100,
-          high: true,
+          high: true
         },
         {
           key: "spare_qty",
@@ -207,7 +207,7 @@ export default {
           align: "right",
           width: 100,
           high: true,
-          hide: true,
+          hide: true
         },
         {
           key: "plan_start",
@@ -242,7 +242,7 @@ export default {
           align: "center",
           resizable: true,
           width: 150,
-          type:"date"
+          type: "date"
         },
         {
           key: "demand_finish",
@@ -251,7 +251,7 @@ export default {
           high: true,
           resizable: true,
           width: 150,
-          type:"date"
+          type: "date"
         },
         {
           key: "badjustflag",
@@ -372,6 +372,11 @@ export default {
         if (r.success) {
           this.$Message.success("移出排产池操作成功");
           this.loadList();
+          //移出排产后将aps对应的store数量去掉
+          this.$store.commit(
+            "setCountAps",
+            this.$store.state.countAps - paramsArry.length
+          );
         }
       });
     },

pages/aps/plan/index.vue

@@ -21,10 +21,33 @@
         </Form>
       </template>
       <template slot="searchBack">
-        <a href="javascript:;" @click="goAps">APS排产</a>
-        <a>智能排产</a>
-        <a>整机排产</a>
-        <a>流水排产</a>
+        <Badge
+          :count="this.$store.state.countAps"
+          overflow-count="99"
+          style="margin-right:15px;"
+          type="info"
+        >
+          <a href="javascript:;" @click="goAps">APS排产&nbsp;&nbsp;&nbsp;</a>
+        </Badge>
+        <Badge
+          :count="this.$store.state.countAi"
+          overflow-count="99"
+          style="margin-right:15px;"
+          type="info"
+        >
+          <a href="javascript:;">智能排产&nbsp;&nbsp;&nbsp;</a>
+        </Badge>
+        <Badge
+          :count="this.$store.state.countAll"
+          overflow-count="99"
+          style="margin-right:15px;"
+          type="info"
+        >
+          <a href="javascript:;">整机排产&nbsp;&nbsp;&nbsp;</a>
+        </Badge>
+        <Badge :count="this.$store.state.countRun" overflow-count="99" type="info">
+          <a href="javascript:;">流水排产&nbsp;&nbsp;&nbsp;</a>
+        </Badge>
       </template>
       <template slot="searchForm">
         <Search />
@@ -56,16 +79,29 @@
     <Modal v-model="dispatchModal" title="工艺派发" footer-hide width="800">
       <Dispatch @on-close="cancel" :ids="listBatchIds" @on-ok="addOk" />
     </Modal>
-    <Modal v-model="scheduleModal" title="移入排产" width="800" @on-ok="scheduleOk" @on-cancel="cancel">
+    <Modal v-model="scheduleModal" title="移入排产" width="800">
       <p>&nbsp;</p>
-      <p>&nbsp;</p>
-      <p>确定将订单 {{resultsOrderList}} 移入排产？</p>
+      <h4>请选择排产模型：</h4>
+      <RadioGroup v-model="scheduleType" class="radioList" @on-change="onchangeScheduleType">
+        <Radio label="1" border>APS排产</Radio>
+        <Radio label="2" border>智能排产</Radio>
+        <Radio label="3" border>整机排产</Radio>
+        <Radio label="4" border>流水排产</Radio>
+      </RadioGroup>
+
+      <p class="pl30 pt10" v-show="scheduleType!=''">
+        确定将订单 {{resultsOrderList}} 移入
+        <span class="red fwBold">{{scheduleTypeName}}</span>？
+      </p>
       <p>&nbsp;</p>
       <p>&nbsp;</p>
+      <div slot="footer">
+        <Button @click="cancel">取消</Button>
+        <Button type="primary" @click="scheduleOk">确定</Button>
+      </div>
     </Modal>
-     <Modal v-model="orderSupportModal" title="配套下发" footer-hide width="1300">
-    
-         <orderSupport ref="orderSupport"></orderSupport>
+    <Modal v-model="orderSupportModal" title="配套下发" footer-hide width="1300">
+      <orderSupport ref="orderSupport"></orderSupport>
     </Modal>
   </div>
 </template>
@@ -166,7 +202,7 @@ export default {
           align: "left",
           easy: true,
           high: true,
-          code: "plan.order.urgencyLevel",
+          code: "plan.order.urgencyLevel"
         },
 
         {
@@ -306,12 +342,14 @@ export default {
                   },
                   on: {
                     click: () =>
-                      params.row.isSupportingFinish == 2||  params.row.isSupportingFinish == 3 
+                      params.row.isSupportingFinish == 2 ||
+                      params.row.isSupportingFinish == 3
                         ? this.supportDis(params.row)
                         : null
                   }
                 },
-                params.row.isSupportingFinish == 2||  params.row.isSupportingFinish == 3 
+                params.row.isSupportingFinish == 2 ||
+                  params.row.isSupportingFinish == 3
                   ? "配套派发"
                   : ""
               )
@@ -330,11 +368,13 @@ export default {
       resultsStatus: 0,
       dispatchStatus: 0, //派发标识
       scheduleStatus: 0, //排产标识
-      resultsOrderList: ""
+      resultsOrderList: "",
+      scheduleType: "",
+      scheduleTypeName: ""
     };
   },
   mounted() {
-    console.log(this);
+    this.loadInitCount();
   },
   async fetch({ store, params }) {
     await store.dispatch("loadDictionary"); // 加载数据字典
@@ -437,26 +477,37 @@ export default {
       }
     },
     supportDis(value) {
-     
-       this.orderSupportModal=true,
-       this.$refs.orderSupport.loaddata(value.id);
+      (this.orderSupportModal = true),
+        this.$refs.orderSupport.loaddata(value.id);
     },
     scheduleOk() {
-      let params = { ids: this.listBatchIds };
-      Api.moveinbatch(params)
-        .then(r => {
-          if (r.success) {
-            this.$Message.success("移入排产成功");
-             this.$refs.grid.reload(this.easySearch);
-          } else {
+      if (this.scheduleType == "") {
+        this.$Message.error("请选择排产模型");
+      } else {
+        let params = {
+          ids: this.listBatchIds,
+          poolType: Number(this.scheduleType)
+        };
+        Api.moveinbatch(params)
+          .then(r => {
+            if (r.success && r.result == true) {
+              this.$Message.success("移入排产成功");
+              this.$refs.grid.reload(this.easySearch);
+              this.changeCountOut(this.scheduleType, this.listBatchIds.length);
+            } else {
+              if (!r.result.res) {
+                this.$Message.error(r.result.msg);
+              } else {
+                this.$Message.error("移入排产失败");
+              }
+            }
+          })
+          .catch(err => {
             this.$Message.error("移入排产失败");
-          }
-        })
-        .catch(err => {
-          this.$Message.error("移入排产失败");
-        });
-      this.canselFooter();
-      this.cancel();
+          });
+        this.canselFooter();
+        this.cancel();
+      }
     },
     //跳转到aps排产池（有判断）
     goAps() {
@@ -542,6 +593,57 @@ export default {
         }
       }
       return temp;
+    },
+    //移入排产前选择排产模型
+    onchangeScheduleType(val) {
+      switch (val) {
+        case "2":
+          this.scheduleTypeName = "智能排产";
+          break;
+        case "3":
+          this.scheduleTypeName = "整机排产";
+          break;
+        case "4":
+          this.scheduleTypeName = "流水排产";
+          break;
+        default:
+          this.scheduleTypeName = "APS排产";
+      }
+    },
+    //移入排产成功后给标题增加数量
+    changeCountOut(type, count) {
+      switch (type) {
+        case "2":
+          this.$store.commit("setCountAi", this.$store.state.countAi + count);
+          break;
+        case "3":
+          this.$store.commit("setCountAll", this.$store.state.countAll + count);
+          break;
+        case "4":
+          this.$store.commit("setCountRun", this.$store.state.countRun + count);
+          break;
+        default:
+          this.$store.commit("setCountAps", this.$store.state.countAps + count);
+      }
+    },
+    //进入页面加载排产count
+    loadInitCount() {
+      this.$store.commit("setCountAps", 0);
+      this.$store.commit("setCountAi", 0);
+      this.$store.commit("setCountAll", 0);
+      this.$store.commit("setCountRun", 0);
+      Api.getCount()
+        .then(res => {
+          if (res.success && res.result == true) {
+            this.$store.commit("setCountAps", 3);
+            this.$store.commit("setCountAi", 1);
+            this.$store.commit("setCountAll", 1);
+            this.$store.commit("setCountRun", 0);
+          }
+        })
+        .catch(err => {
+          this.$Message.error("获取排产模型数量失败");
+        });
     }
   }
 };
@@ -550,4 +652,13 @@ export default {
 .footerSpan {
   width: 120px;
 }
+.demo-badge-alone {
+  background: #5cb85c !important;
+}
+.radioList {
+  margin: 10px 30px;
+}
+.radioList label {
+  margin-top: 5px;
+}
 </style>
\ No newline at end of file

pages/mesPlan/index.vue

@@ -713,6 +713,7 @@ export default {
       this.curId = 0;
     },
     search() {
+      this.easySearch.keys.value = this.easySearch.keys.value.trim();
       this.$refs.grid.reload(this.easySearch);
     },
     detail(row) {

store/index.js

@@ -10,6 +10,10 @@ export const state = () => ({
   },
   cart:[],
   count: 0,
+  countAps:0,//aps排产
+  countAi:0,//智能排产
+  countAll:0,//整机排产
+  countRun:0,//流水排产
 })
 export const getters = {
   dictionaryByKey: (state) => (key) => {
@@ -59,6 +63,18 @@ export const mutations = {
   },
   setCartCount(state, count) {
     state.count = count;
+  },
+  setCountAps(state, count) {//设置aps排产数量
+    state.countAps = count;
+  },
+  setCountAi(state, count) {//设置智能排产数量
+    state.countAi = count;
+  },
+  setCountAll(state, count) {//设置整机排产数量
+    state.countAll = count;
+  },
+  setCountRun(state, count) {//设置流水排产数量
+    state.countRun = count;
   }
 }