Merge branch 'product' of 39.98.128.195:zhouyx/mes-ui into product

pages/aps/aps/components/check.vue

+<template>
+  <div>
+      <h3 class="tc" v-if="data.res">
+          <Icon type="md-checkmark-circle" size="32" color="green"/>
+          数据检查通过
+      </h3>
+            <h3 class="tc" v-else>
+
+          <Icon type="md-close-circle" size="32" color="red"/>
+          数据检查失败
+      </h3>
+    <div>
+      <Tabs>
+        <TabPane v-for="(item,key,index) in list" :key="key" :label="key"  :name="key">
+            <Table :columns="init(item)" :data="item" height="500" border></Table>
+        </TabPane>
+      </Tabs>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "",
+  data() {
+    return {
+        datas:{},     
+    };
+  },
+  props:{
+      data:Object,
+      default:()=>{
+          return {
+              res:true,
+              datas:{},
+          }
+      }
+  },
+  computed:{
+      list(){
+           var data={};
+           var item=JSON.parse(this.data.datas);
+              for(var key in item)
+              {
+                  if(item[key]&& item[key].length>0){
+                      data[key]= item[key];
+                  }
+              }
+          return data;
+      }
+  },
+  methods:{
+      init(items){
+          var cols=[];
+            if(items.length>0){
+                for(var key in items[0]){
+                    let col={
+                        key:key,
+                        title:key
+                    }
+                    cols.push(col);
+                }
+            }
+          return cols;
+      }
+  }
+ 
+};
+</script>
+
+<style lang="less" >
+</style>
\ No newline at end of file

pages/aps/aps/index.vue

@@ -14,31 +14,36 @@
       :easy="true"
     >
       <template slot="easySearch">
-        <div><Select
-          placeholder="选择排序优先级"
-          v-model="tempValue"
-          style="width: 150px;"
-          @on-change="tempValueChange"
-          clearable
-        >
-          <Option v-for="(item,index) in listTemp" :key="index" :value="item.id" :label="item.name"></Option>
-        </Select>
-        <a style="font-weight: bold;" @click="openaddModalTemp">
-          <Icon type="md-color-palette" size="14" />&nbsp;自定义排序模板
-        </a>
-        <a style="font-weight: bold;" @click="openDuration">
-          <Icon type="md-create" size="14" />&nbsp;修改外协工期
-        </a>
+        <div>
+          <Select
+            placeholder="选择排序优先级"
+            v-model="tempValue"
+            style="width: 150px;"
+            @on-change="tempValueChange"
+            clearable
+          >
+            <Option
+              v-for="(item,index) in listTemp"
+              :key="index"
+              :value="item.id"
+              :label="item.name"
+            ></Option>
+          </Select>
+          <a style="font-weight: bold;" @click="openaddModalTemp">
+            <Icon type="md-color-palette" size="14" />&nbsp;自定义排序模板
+          </a>
+          <a style="font-weight: bold;" @click="openDuration">
+            <Icon type="md-create" size="14" />&nbsp;修改外协工期
+          </a>
           <Select placeholder="选择历史方案" style="width: 150px;"></Select>
         </div>
       </template>
-      <template slot="searchBack">       
-      </template>
+      <template slot="searchBack"></template>
       <template slot="searchForm">
         <Search />
       </template>
       <template slot="buttons">
-         <DatePicker
+        <DatePicker
           type="date"
           placeholder="设置基准日期"
           style="width: 150px;"
@@ -52,7 +57,8 @@
           type="primary"
           @click="goResults"
           style="background:#515A6E;border:solid 1px #515A6E"
-        >查看历史方案</Button>
+        >历史方案</Button>
+        <Button type="primary" @click="resultModal=true">Result</Button>
         <Button type="primary" @click="openApsModal">APS排产</Button>
       </template>
       <template slot="batch">
@@ -78,6 +84,9 @@
     <Modal v-model="apsModal" title="确定APS排产" @on-ok="apsOk" @on-cancel="cancel">
       <p>确定进行APS排产？</p>
     </Modal>
+    <Modal v-model="resultModal" title="数据检查" width="1500" @on-ok="checkOk" @on-cancel="cancel">
+      <CheckResult :data="result"></CheckResult>
+    </Modal>
     <Modal v-model="apsCheckModal" title="确定APS排产" @on-ok="apsCheckOk" @on-cancel="cancel">
       <p>已有排产方案，是否移出排产池？</p>
     </Modal>
@@ -103,13 +112,15 @@ import Add from "./options";
 import Temp from "./temp";
 import Duration from "./duration";
 import Expand from "./components/excute";
+import CheckResult from "./components/check";
 export default {
   name: "list",
   components: {
     Add,
     Expand,
     Temp,
-    Duration
+    Duration,
+    CheckResult
   },
   data() {
     return {
@@ -117,6 +128,11 @@ export default {
       easySearch: {
         keys: { op: "notes", value: null }
       },
+      result: {
+        res: true,
+        datas: {}
+      },
+      resultModal: false,
       entity: {
         setTime: ""
       },
@@ -512,6 +528,7 @@ export default {
       this.deletedlModal = false;
       this.apsModal = false;
       this.apsCheckModal = false;
+      this.resultModal = false;
     },
     onDragDrop(a, b) {
       //拖拽排序
@@ -575,41 +592,8 @@ export default {
               Api.apsdatachecked()
                 .then(res1 => {
                   if (res1.success) {
-                    if (res1.result.res) {
-                      // this.$Message.success("数据校验成功");
-                      //排产计算
-                      let paramsTime = {
-                        setTime: this.entity.setTime
-                      };
-                      Api.apsprepareandcalc(paramsTime)
-                        .then(res2 => {
-                          if (res2.success) {
-                            if (res2.result.res) {
-                              this.$Message.success("排产计算成功");
-                              this.circleModal = false;
-                              this.$router.push({
-                                path: "/aps/results"
-                                // params: { customerId: id }
-                              });
-                            } else {
-                              this.circleModal = false;
-                              this.$Message.error(res2.result.msg);
-                            }
-                          } else {
-                            this.circleModal = false;
-                            this.$Message.error("操作失败：排产计算");
-                          }
-                        })
-                        .catch(
-                          function(err) {
-                            this.circleModal = false;
-                            this.$Message.error("操作失败");
-                          }.bind(this)
-                        );
-                    } else {
-                      this.circleModal = false;
-                      this.$Message.success("数据校验失败");
-                    }
+                    this.result=res1.result;
+                    this.resultModal=true;
                   } else {
                     this.circleModal = false;
                     this.$Message.error("操作失败：数据校验");
@@ -637,6 +621,37 @@ export default {
           }.bind(this)
         );
     },
+    checkOk() {
+      //排产计算
+      let paramsTime = {
+        setTime: this.entity.setTime
+      };
+      Api.apsprepareandcalc(paramsTime)
+        .then(res2 => {
+          if (res2.success) {
+            if (res2.result.res) {
+              this.$Message.success("排产计算成功");
+              this.circleModal = false;
+              this.$router.push({
+                path: "/aps/results"
+                // params: { customerId: id }
+              });
+            } else {
+              this.circleModal = false;
+              this.$Message.error(res2.result.msg);
+            }
+          } else {
+            this.circleModal = false;
+            this.$Message.error("操作失败：排产计算");
+          }
+        })
+        .catch(
+          function(err) {
+            this.circleModal = false;
+            this.$Message.error("操作失败");
+          }.bind(this)
+        );
+    },
     //打开设置参数
     openAddModel(type, row) {
       if (type == 2) {

pages/produce/execute/datafilling/sendCheck.vue

@@ -63,7 +63,7 @@ export default {
         checker: 0,
         check_time: null
       },
-      isall:[],
+      isall:false,
       isMain: 1,
       productisabled: false,
       product_ID: [],