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

components/page/dataGrid.vue

@@ -277,14 +277,14 @@ export default {
     } else {
       this.easySearch();
     }
-    console.warn("this.$refs.main.clientX",this.$refs.main.offsetTop,this.$refs.main.offsetHeight)
+    // console.warn("this.$refs.main.clientX",this.$refs.main.offsetTop,this.$refs.main.offsetHeight)
     if (this.height === 0) {
       this.$nextTick(() => {
         this.tableHeight = this.$refs.main.offsetHeight;        
         if (this.tableHeight < 300) {
           this.tableHeight = window.screen.availHeight -this.$refs.main.offsetTop-200;
         }
-        console.warn("this.$refs.main.VVV",this.tableHeight)
+        // console.warn("this.$refs.main.VVV",this.tableHeight)
         window.onresize = () => {
           ///浏览器窗口大小变化
           return (() => {

layouts/basic-layout/product.vue

@@ -458,7 +458,7 @@ export default {
             }
           }
           .t_title {
-            min-width: 120px;
+            min-width: 150px;
             background: #515a6e;
             .a_goIndex {
               color: #fff;

pages/aps/aps/index.vue

@@ -83,7 +83,10 @@
     <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">
+    <!-- <Modal v-model="resultModal" title="数据检查" width="1500" @on-ok="checkOk" @on-cancel="cancel">
+      <CheckResult :data="result"></CheckResult>
+    </Modal> -->
+    <Modal v-model="resultModal" title="数据检查" width="1500" @on-ok="cancel" @on-cancel="cancel">
       <CheckResult :data="result"></CheckResult>
     </Modal>
     <Modal v-model="apsCheckModal" title="确定APS排产" @on-ok="apsCheckOk" @on-cancel="cancel">
@@ -591,11 +594,14 @@ export default {
               Api.apsdatachecked()
                 .then(res1 => {
                   if (res1.success) {
-                    this.result=res1.result;
-                    this.resultModal=true;
+                    // this.result=res1.result;
+                    // this.resultModal=true;
+                    this.checkOk();
                   } else {
-                    this.circleModal = false;
-                    this.$Message.error("操作失败：数据校验");
+                    // this.circleModal = false;
+                    // this.$Message.error("操作失败：数据校验");
+                     this.result=res1.result;
+                    this.resultModal=true;
                   }
                 })
                 .catch(

pages/technology/processview.vue

@@ -36,7 +36,7 @@
                 </div>
               </Col>
               <Col span="3">
-                <div class="row_label">任务类型</div>
+                <div class="row_label">工艺类型</div>
               </Col>
               <Col span="9">
                 <div class="iview_cont border_none">

pages/technology/productMix/product/add.vue

@@ -228,6 +228,10 @@ export default {
     width: 100%;
     height: 300px;
     overflow: hidden;
+    img{
+      width: 300px;
+      max-height: 300px;
+    }
   }
 }
 </style>
\ No newline at end of file

pages/technology/productMix/product/edit.vue

@@ -228,7 +228,11 @@ export default {
   .add-list {
     width: 100%;
     height: 300px;
-    overflow: hidden;
+    overflow: hidden;    
+    img{
+      width: 300px;
+      max-height: 300px;
+    }
   }
 }
 </style>
\ No newline at end of file

pages/technology/productMix/product/index.vue

@@ -367,11 +367,14 @@ export default {
       padding: 10px;
       .img-i {
         width: 90px;
-        height: 100px;
         background: #eee;
         height: 90px;
         margin-right: 15px;
-        overflow: hidden;
+        // overflow: hidden;
+        img{
+          width: 90px;
+          height: 90px;
+        }
       }
       .c div {
         margin-bottom: 8px;