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

components/page/dataGrid.vue

@@ -104,7 +104,7 @@
     <FooterToolbar v-if="batch" v-show="footerToolbar">
       <div class="tip">已选{{selectItems.length}}项</div>
       <slot name="batch"></slot>
-      <Button @click="footerToolbar=false">取消</Button>
+      <Button @click="cancelBatch">取消</Button>
     </FooterToolbar>
   </div>
 </template>
@@ -296,8 +296,8 @@ export default {
       }
       if (this.action) {
         //条件初始化处理。
-        if(this.initsearch){
-          this.initsearch(this.search)
+        if (this.initsearch) {
+          this.initsearch(this.search);
         }
         this.$api.post(this.action, this.search).then(r => {
           if (this.format) {
@@ -484,6 +484,11 @@ export default {
     },
     selectAll(status) {
       this.$refs.table.selectAll(status);
+    },
+    //批量取消
+    cancelBatch() {
+      this.footerToolbar = false;
+      this.$refs.table.selectAll(false);
     }
   },
   computed: {

pages/produce/orderlist.vue

@@ -37,7 +37,7 @@
             <Col :span="4">
               <div class="sanjiao" :style="tdStyle(row.status)"></div>
               <div class="box">
-                <div class="text" style="font-size:4px;font-weight:normal">
+                <div class="text">
                   <state
                     code="taskList.status"
                     ref="state"
@@ -217,7 +217,15 @@ export default {
     search() {
       this.$refs.grid.reload(this.easySearch);
     },
-    toExecute(id, orderId, executeId, headid, routingDetailId,quantity, status) {
+    toExecute(
+      id,
+      orderId,
+      executeId,
+      headid,
+      routingDetailId,
+      quantity,
+      status
+    ) {
       //跳转到对应操作页面  获取id:this.$route.query.id
       this.$router.push({
         path: "/produce/execute",
@@ -315,11 +323,11 @@ export default {
   height: calc(100vh - 110px);
   .body {
     background: white;
-    border-radius: 4px;
+    border-radius: 4px 0 4px 4px;
     border: #cacbd0 solid 1px;
     margin-bottom: 30px;
     .title-i {
-      padding: 0 8px;
+      padding: 0 0 0 8px;
       height: 38px;
       line-height: 38px;
       color: #2680eb;
@@ -352,32 +360,30 @@ export default {
     box-shadow: 0 0 10px #888888;
   }
 }
+
 .sanjiao {
-  margin: 38px;
   height: 0px;
-  width: 0px;
-  border-left: solid 60px transparent;
-  position: absolute;
-  right: -46px;
-  top: -38px;
+  width: 0;
+  border-left: solid 50px transparent;
+  float: right;
+  margin-right:-1px;
 }
 .box {
   color: white;
-  width: 80px;
-  height: 30px;
-  overflow: hidden;
+  float: right;
+  margin-top: -42px;
   /* Rotate div */
-  transform: rotate(33deg);
-  -ms-transform: rotate(33deg); /* Internet Explorer */
-  -moz-transform: rotate(33deg); /* Firefox */
-  -webkit-transform: rotate(33deg); /* Safari 和 Chrome */
-  -o-transform: rotate(33deg); /* Opera */
+  transform: rotate(37deg);
+  -ms-transform: rotate(37deg); /* Internet Explorer */
+  -moz-transform: rotate(37deg); /* Firefox */
+  -webkit-transform: rotate(37deg); /* Safari 和 Chrome */
+  -o-transform: rotate(37deg); /* Opera */
   .text {
-    position: absolute;
-    left: 32px;
-    top: -13px;
+    font-size: 8px;
+    font-weight: normal;
   }
 }
+
 .rowBottom .ivu-col-span-10 {
   height: 24px;
   padding-right: 10px;

pages/resource/material/placode/index.vue

 <template>
   <Layout class="full">
     <Sider hide-trigger :style="{background: '#fff'}" class="menu" width="240" style=" flex:0;">
-      <StoreHouseLeft @storeIds="storeIds" :type='1'></StoreHouseLeft>
+      <StoreHouseLeft @storeIds="storeIds" :type='2'></StoreHouseLeft>
     </Sider>
     <Content class="content">
       <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :height="tdHeight">

pages/resource/material/placode/inventory.vue

@@ -51,6 +51,7 @@
       :show.sync="showStoreHouseTree"
       :value.sync="conditions.storeId.value"
       :text.sync="conditions.storeTitle.value"
+      :type='2'
     />
   </div>
 </template>

pages/resource/material/powder/inventory.vue

@@ -51,6 +51,7 @@
       :show.sync="showStoreHouseTree"
       :value.sync="conditions.storeId.value"
       :text.sync="conditions.storeTitle.value"
+      :type='1'
     />
   </div>
 </template>

pages/resource/material/scraper/index.vue

 <template>
   <Layout class="full">
      <Sider hide-trigger :style="{background: '#fff'}" class="menu" width="240" style=" flex:0;">
-      <StoreHouseLeft @storeIds="storeIds" c></StoreHouseLeft>
+      <StoreHouseLeft @storeIds="storeIds"  :type='3'></StoreHouseLeft>
     </Sider>
     <Content class="content">
       <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :height="tdHeight">

pages/resource/material/scraper/inventory.vue

@@ -51,6 +51,7 @@
       :show.sync="showStoreHouseTree"
       :value.sync="conditions.storeId.value"
       :text.sync="conditions.storeTitle.value"
+      :type='3'
     />
   </div>
 </template>