buton primary

pages/aps/aps/index.vue

@@ -15,9 +15,15 @@
     >
       <template slot="easySearch"></template>
       <template slot="searchBack">
-        <Select placeholder="选择历史方案" style="width: 150px"></Select>
-        <DatePicker type="date" placeholder="设置基准日期" style="width: 150px"></DatePicker>
-        <a style="font-weight:bold" @click="addModal=true">
+        <Select placeholder="选择历史方案" style="width: 150px;"></Select>
+        <DatePicker
+          type="date"
+          placeholder="设置基准日期"
+          style="width: 150px"
+          v-model="entity.setTime"
+          @on-change="getTime"
+        ></DatePicker>
+        <a style="font-weight:bold;" @click="addModal=true">
           <Icon type="ios-options" size="14" />&nbsp;工序参数调整
         </a>
       </template>
@@ -25,7 +31,7 @@
         <Search />
       </template>
       <template slot="buttons">
-        <Button type="primary" @click="apsModal=true">APS排产</Button>
+        <Button type="primary" @click="openApsModal">APS排产</Button>
       </template>
       <template slot="batch">
         <Button type="primary" class="mr10 ml10" @click="removeOk">移出排产</Button>
@@ -55,6 +61,9 @@ export default {
       easySearch: {
         keys: { op: "notes", value: null }
       },
+      entity: {
+        setTime: ""
+      },
       addModal: false,
       editModal: false,
       detailModal: false,
@@ -270,7 +279,7 @@ export default {
         if (r.success) {
           this.$Message.success("恢复成功");
           this.list = [];
-          this.loadList()
+          this.loadList();
         }
       });
     },
@@ -321,11 +330,29 @@ export default {
     openParms(id) {
       this.addModal = true;
     },
+    getUserDepart() {
+      alert("5656565");
+      // Api.getUserDepart().then(res=>{
+      //   console.log("11111",res)
+      //   return res
+      // })
+    },
+
     l(key) {
       let vkey = "mes_part_task_plan_simulate" + "." + key;
       return this.$t(vkey) || key;
     },
-    //a确定aps排产
+    getTime(value) {
+      this.entity.getTime = value;
+    },
+    openApsModal() {
+      if (this.entity.setTime != "") {
+        this.apsModal = true;
+      } else {
+        this.$Message.error("请设置基准日期");
+      }
+    },
+    //确定aps排产
     apsOk() {
       //APS排产前订单优先级功能
       let parmsOrderpriority = { alls: [] };
@@ -337,29 +364,34 @@ export default {
         arryIds.push(objIds);
       });
       parmsOrderpriority.alls = arryIds;
-     // alert(JSON.stringify(parmsOrderpriority));
+      // alert(JSON.stringify(parmsOrderpriority));
       Api.orderpriority(parmsOrderpriority).then(res => {
         if (res.success) {
           if (res.result) {
             this.$Message.success("排序成功");
             //apsp排产前检查
-            Api.apsdatachecked().then(res1=>{
-              if(res1.success)
-              {
-                if(res1.result)
-                {
+            Api.apsdatachecked().then(res1 => {
+              if (res1.success) {
+                if (res1.result.res) {
                   this.$Message.success("数据校验成功");
-                }
-                else
-                {
+                  //排产计算
+                  let paramsTime = {
+                    setTime: this.entity.setTime
+                  };
+                  Api.apsprepareandcalc(paramsTime).then(res2 => {
+                    if (res2.success) {
+                      this.$Message.success("排产计算成功");
+                    } else {
+                      this.$Message.error("操作失败：排产计算");
+                    }
+                  });
+                } else {
                   this.$Message.success("数据校验失败");
                 }
-              }
-              else{
+              } else {
                 this.$Message.error("操作失败：数据校验");
               }
-            })
-
+            });
           } else {
             this.$Message.error("排序失败，请重新APS排产操作");
           }
@@ -367,7 +399,6 @@ export default {
           this.$Message.error("操作失败：排序");
         }
       });
-      //APS排产前数据合法性校验
     }
   }
 };

pages/resourceManagement/EquipmentCalendar/components/newEquipment.vue

@@ -38,7 +38,7 @@
       <div slot="footer">
         <!-- class="footers" -->
         <Button @click="close">取消</Button>
-        <Button @click="saveOk" type="success">保存</Button>
+        <Button @click="saveOk" type="primary">保存</Button>
       </div>
     </Modal>
     <Department

pages/resourceManagement/EquipmentCalendar/index.vue

@@ -337,7 +337,7 @@
       <div class="search-form">
         <Row>
           <Col span="1" style=" text-align: right;">
-            <Button type="success" @click="newMainBack">维保反馈</Button>
+            <Button type="primary" @click="newMainBack">维保反馈</Button>
             <!-- <Button type="success" @click="deleted">删除</Button> -->
           </Col>
         </Row>

pages/resourceManagement/deviceManagementCP/components/newEquipment.vue

@@ -84,7 +84,7 @@
       <div slot="footer">
         <!-- class="footers" -->
         <Button @click="close">取消</Button>
-        <Button @click="saveOk" type="success">保存</Button>
+        <Button @click="saveOk" type="primary">保存</Button>
       </div>
     </Modal>
     <Department

pages/resourceManagement/deviceManagementCP/index.vue

@@ -337,7 +337,7 @@
       <div class="search-form">
         <Row>
           <Col span="1" style=" text-align: right;">
-            <Button type="success" @click="newMainBack">维保反馈</Button>
+            <Button type="primary" @click="newMainBack">维保反馈</Button>
             <!-- <Button type="success" @click="deleted">删除</Button> -->
           </Col>
         </Row>