表格样式修改

assets/css/base.less

@@ -938,19 +938,21 @@ html [type=button] {
 }
 
 .action {
-    .op{
+    a {        
+        color: #1890FF; //查看和其他
+        span{
+            padding: 4px;
+        }
         i{
             font-size: 16px;
+            padding: 4px;
+            border-radius: 3px;
         }
         i:hover{
             background: #1890FF;
             color: #fff;
         }
     }
-    a {
-        margin: 0 5px;
-        color: #1890FF; //查看和其他
-    }
 
     a.detail{
         color: #1890FF; //查看和其他
@@ -975,6 +977,10 @@ html [type=button] {
 
     a.remove,a.delete {
         color: #FF7A8B;
+        i:hover{
+            background: #FF7A8B;
+            color: #fff;
+        }
     }
     a.delete {
         color: #FF7A8B;

components/page/dataGrid.vue

 <template>
-  <div class="table-content myBug">
-    <div class="table-tools" v-if="tool">
+  <div class="table-content myBug flex fd">
+    <div class="table-tools" v-if="tool" ref="tools">
       <div class="table-search" v-if="easy">
         <slot name="easySearch">
           <Input
@@ -11,7 +11,7 @@
             v-model="keys"
           />
         </slot>
-      </div>&nbsp;
+      </div>
       <Button v-if="high" @click="modalSearch=true" type="text">
         <Icon type="md-search" />高级
       </Button>
@@ -25,6 +25,7 @@
         </Button>
       </div>
     </div>
+    <div class="fg" ref="ftable">
       <div v-if="type=='card'" class="table-card">
         <Row>
           <Col :span="span" v-for="(row,i) in list" :key="i">
@@ -44,14 +45,14 @@
         :size="size"
         :row-key="rowKey"
         ref="table"
-      class="tableCommon"
+        class="tableCommon fg"
         @on-expand="expand"
         @on-drag-drop="onDragDrop"
         @on-selection-change="selectionChange"
         @on-select="onSelect"
         :loading="loading"
       ></Table>
-    <div class="table-footer">
+      <div class="table-footer" ref="footer">
       <div>
         <slot name="footer"></slot>
       </div>&nbsp;
@@ -59,7 +60,7 @@
         v-if="page"
         :total="search.total"
         :current="search.page"
-        class="mr15 mt5 fr"
+        class="mr15 mt15 fr"
         show-total
         size="small"
         show-elevator
@@ -70,6 +71,7 @@
         @on-page-size-change="pageSizeChange"
       />
       </div>
+    </div>
     <Modal v-if="high" v-model="modalSearch" title="高级搜索" draggable width="800" ref="search">
       <slot name="searchForm"></slot>
       <div slot="footer">
@@ -105,7 +107,7 @@
         </li>
       </ul>
     </Drawer>
-    <FooterToolbar style="height:65px" v-if="batch" v-show="footerToolbar">
+    <FooterToolbar style="height:60px" v-if="batch" v-show="footerToolbar">
       <div class="tip">
         已选{{selectItems.length}}项
         <slot name="batch"></slot>
@@ -268,6 +270,7 @@ export default {
       window.onresize = () => {
         ///浏览器窗口大小变化
         return (() => {
+          // console.log(this.$refs.table)
           window.screenHeight = window.innerHeight;
           this.tableHeight = window.screenHeight - this.firstY - 60;
         })();
@@ -394,7 +397,11 @@ export default {
       this.$emit("on-drag-drop", a, b);
     },
     easySearch() {
-      if (this.conditions&& this.conditions.keys && this.conditions.keys.default) {
+      if (
+        this.conditions &&
+        this.conditions.keys &&
+        this.conditions.keys.default
+      ) {
         //判断没有传入条件的用默认的查询
         this.conditions.keys.value = this.keys;
       }
@@ -541,7 +548,23 @@ export default {
 <style lang="less" scoped>
 .table-content {
   position: relative;
-  // height: 100%;
+  height: 100%;
+  .table-tools {
+    height: 50px;
+    overflow: hidden;
+    .table-search {
+      float: left;
+      line-height: 50px;
+      .ivu-form-item {
+        margin-bottom: 0;
+      }
+    }
+    .btns {
+      float: right;
+      text-align: right;
+      height: 40px;
+    }
+  }
   .tableCommon {
     width: 100%;
   }
@@ -553,7 +576,9 @@ export default {
     font-size: 14px;
     background: #f5f6fa;
   }
-
+  .fg {
+    overflow: auto;
+  }
   .tableCommon tr td {
     line-height: 25px;
     font-size: 14px;
@@ -570,16 +595,6 @@ export default {
     display: block;
     overflow-y: auto;
   }
-  .table-tools {
-    .table-search {
-      float: left;
-      line-height: 40px;
-    }
-    .btns {
-      float: right;
-      line-height: 40px;
-    }
-  }
 
   .table-set {
     cursor: pointer;
@@ -587,9 +602,9 @@ export default {
   .table-set:hover {
     color: orange;
   }
-  // .table-footer {
-  //   line-height: 40px;
-  // }
+  .table-footer {
+    height: 40px;
+  }
 }
 .table-columns {
   max-height: calc(100% - 50px);

pages/aps/aps/components/edit.vue

@@ -15,7 +15,7 @@
 
       <Col :span="12" v-model="entity.rUNTIME">
         <FormItem :label="l('rUNTIME')" prop="rUNTIME">
-          <InputNumber v-model="entity.run_time" :max="100" :min="1"></InputNumber>
+          <InputTime v-model="entity.run_time" ></InputTime>
         </FormItem>
       </Col>
       <Col :span="12">

pages/aps/aps/components/excute.vue

@@ -351,7 +351,7 @@ export default {
                   icon: "ios-trash",
                   type: "icon",
                   title: "删除工序",
-                  oprate: "edit",
+                  oprate: "delete",
                   msg: "确认要刪除工序吗？"
                 },
                 on: { click: () => this.remove(params.row, params.index) }

pages/aps/aps/index.vue

@@ -338,23 +338,23 @@ export default {
               }),
               h("op", {
                 attrs: {
-                  icon: "md-return-left",
+                  icon: "md-refresh",
                   type: "icon",
-                  title: "移出排产池",
+                  title: "恢复工序",
                   oprate: "edit",
-                  msg: "确认要移出排产吗？"
+                  msg: "确认要恢复工序吗？"
                 },
-                on: { click: () => this.remove(params.row.part_task_pk) }
+                on: { click: () => this.refresh(params.row.part_task_pk) }
               }),
               h("op", {
                 attrs: {
-                  icon: "md-refresh",
+                  icon: "ios-trash",
                   type: "icon",
-                  title: "恢复工序",
-                  oprate: "edit",
-                  msg: "确认要恢复工序吗？"
+                  title: "移出排产池",
+                  oprate: "delete",
+                  msg: "确认要移出排产吗？"
                 },
-                on: { click: () => this.refresh(params.row.part_task_pk) }
+                on: { click: () => this.remove(params.row.part_task_pk) }
               })
             ]);
           }

pages/technology/details/routingStep/add.vue

@@ -28,6 +28,7 @@
             v-model="entity.stepContent"
             :height="260"
             v-paste="handleImg"
+            border
           />
           <!-- <Input v-model="entity.stepContent" type="textarea" :rows="5"></Input> -->
           <!-- <Input v-model="entity.stepContent" type="textarea" :minRows="3", :maxRows="7" ></Input> -->
@@ -117,9 +118,9 @@ export default {
       entity: {
         routingHeaderId: 0,
         routingDetailId: 0,
-        stepSeq: null,
+        stepSeq: 0,
         name: "",
-        status: null,
+        status: 1,
         stepContent: "",
       },
       rules: {

pages/technology/index.vue

@@ -72,14 +72,14 @@
             </a>
           </div>
           <div class="fg tc f14 fwBold blueTitle">
-            工艺信息&nbsp;&nbsp;&nbsp;&nbsp;{{l('code')}}：
-            <span class="grayTitle">{{titleObj.code}}</span>&nbsp;&nbsp;&nbsp;&nbsp;
+           {{l('code')}}：
+            <span class="grayTitle mr10">{{titleObj.code}}</span>
             {{l('name')}}：
-            <span class="grayTitle">{{titleObj.name}}</span>&nbsp;&nbsp;&nbsp;&nbsp;
+            <span class="grayTitle mr10">{{titleObj.name}}</span>
             {{l('routingType')}}：
-            <span class="grayTitle">{{titleObj.routingType}}</span>&nbsp;&nbsp;&nbsp;&nbsp;
+            <span class="grayTitle mr10">{{titleObj.routingType}}</span>
             {{l('version')}}：
-            <span class="grayTitle">{{titleObj.version}}</span>&nbsp;&nbsp;&nbsp;&nbsp;
+            <span class="grayTitle">{{titleObj.version}}</span>
             <!-- {{l('departmentId')}}：
             <span class="grayTitle">{{titleObj.departmentId}}</span> -->
           </div>