Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

components/orderOperator/orderInfos.vue

@@ -36,7 +36,7 @@
         <state code="plan.order.guestName" :value="info.orderInfo.guestName+''" type="text"></state>
       </Filed>
 
-      <Filed :span="6" :name="l('functionaryOffice')">>{{info.orderInfo.functionaryOffice}}</Filed>
+      <Filed :span="6" :name="l('functionaryOffice')">{{info.orderInfo.functionaryOffice}}</Filed>
       <Filed :span="6" :name="l('taskRequire')">{{info.orderInfo.taskRequire}}</Filed>
       <Filed :span="6" :name="l('taskInputDate')">{{info.orderInfo.taskInputDate}}</Filed>
       <Filed :span="6" :name="l('mainDepartmentId')">

pages/aps/aps/components/edit.vue

@@ -110,7 +110,7 @@ export default {
   watch: {
     row(v) {
       if (v != {}) {
-        alert(JSON.stringify(v))
+        //alert(JSON.stringify(v))
        this.entity = v
       }
     }

pages/aps/aps/components/excute.vue

@@ -17,7 +17,7 @@
     </Modal>
     <Modal
       v-model="insertlModal"
-      title="插单"
+      :title="insertTItle"
       @on-ok="insertOk"
       @on-cancel="cancel"
     >
@@ -25,7 +25,6 @@
     </Modal>
     <Modal v-model="setParsModal" title="工序参数设置" footer-hide width="1000">
       <Add
-        :eid="curId"
         @on-parameter-ok="addOk"
         @on-close="cancel"
         :opTaskPk="setParams.opTaskPk"
@@ -373,8 +372,8 @@ export default {
         opTaskPk: 0, //工单ID
         partTaskPk: 0, //生产计划ID
         taskSeq: "", //工序编号
-        count: 0,
-      }, //生产计划数量
+        count: 0,//生产计划数量
+      }, 
       //设置参数结束
       rowData:{},//编辑时传入行数据
     };

pages/aps/results/api.js

@@ -14,4 +14,10 @@ export default {
     getdetail(params) {
         return Api.get(`${apsUrl}/scheduletotal/getdetail`, params);
     },
+    processschemedispatch(params) {
+        return Api.post(`${apsUrl}/apspoolappservices/processschemedispatch`, params);
+    },
+    moveintoaps() {//跳转进入排产池前判断
+        return Api.post(`${PlanUrl}/messchedule/moveintoaps`);
+    },
 }

pages/aps/results/index.vue

@@ -51,6 +51,7 @@ export default {
       isactive: 0,
       data: [],
       list: [],
+      id: "",
       columns: [
         {
           type: "expand",
@@ -99,25 +100,25 @@ export default {
         {
           title: "计划开始时间",
           key: "plan_start",
-          width: 220,
+          width: 200,
           align: "center"
         },
         {
           title: "计划结束时间",
           key: "plan_start",
-          width: 220,
+          width: 200,
           align: "center"
         },
         {
           title: "投料时间",
           key: "demand_start",
-          width: 220,
+          width: 200,
           align: "center"
         },
         {
           title: "节点时间",
           key: "demand_finish",
-          width: 220,
+          width: 200,
           align: "center"
         },
         {
@@ -153,6 +154,7 @@ export default {
     },
     listData(id, index) {
       this.isactive = index;
+      this.id = id;
       Api.paged({ scheduleId: id })
         .then(r => {
           if (r.success) {
@@ -183,11 +185,33 @@ export default {
       }
     },
 
-    parameter() {},
-    addOk() {},
-    cancel() {},
+    parameter() {
+      Api.processschemedispatch({
+        id: this.id
+      }).then(r => {
+        if (r.result) {
+          this.$Message.success(r.result.retmsg);
+          this.orderlist();
+        } else {
+          this.$Message.success("下发失败");
+        }
+      });
+    },
     comeBlck() {
       this.$router.push({ path: "/aps/aps" });
+      Api.moveintoaps().then(res => {
+        if (res.success) {
+          if (res.result.res) {
+            this.$router.push({
+              name: "aps-aps"
+            });
+          } else {
+            this.$router.push({
+              name: "aps-plan"
+            });
+          }
+        }
+      });
     }
   }
 };

plugins/request/index.js

@@ -53,7 +53,7 @@ function errorLog (err) {
 // 创建一个 axios 实例
 const service = axios.create({
     baseURL: Setting.apiBaseURL,
-    timeout: 5000, // 请求超时时间
+    timeout: 20000, // 请求超时时间
     transformRequest:[(data)=>{
         function dateFormat(date, fmt) {
           if (null == date || undefined == date) return '';