Merge branch 'product' of 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/aps/aps/options.vue

@@ -28,11 +28,11 @@
                   <Icon type="md-git-compare" />
                 </a>
                 <DropdownMenu slot="list" style="text-align: center;">
-                  <DropdownItem v-for="li in items" :key="li" v-dragging="{ item: li, list: items}">
+                  <DropdownItem v-for="li in items" :key="li.value" v-dragging="{ item: li, list: items}">
                     <a href="#">
                       <Icon type="md-apps" />
                     </a>
-                    <span>{{li}}</span>
+                    <span>{{li.name}}</span>
                   </DropdownItem> 
                 </DropdownMenu>                
               </Dropdown>
@@ -42,7 +42,7 @@
                 v-model="level"
                 :step="1"
                 :min="0"
-                :max="5"
+                :max="4"
                 :marks="levelMarks"
                 show-stops
                 @on-change="setParameter"
@@ -110,6 +110,15 @@
                 <span slot="open">是</span>
                 <span slot="close">否</span>
               </i-switch>
+            </FormItem>
+             <FormItem :label="l('discrete_percent')" prop="discrete_percent">             
+              <Slider
+                v-model="entity.discrete_percent"
+                :step="1"
+                :min="0"
+                :max="100"
+                @on-change="setPercent"
+              ></Slider>
             </FormItem>
             <FormItem :label="l('discrete')" prop="discrete">
               <InputNumber
@@ -117,12 +126,10 @@
                 :disabled="count==0"
                 :min="1"
                 :max="count==0?1:count"
+                 @on-change="setDiscrete"
               ></InputNumber>
               <!-- <span>{{count}}</span> -->
             </FormItem>           
-            <FormItem :label="l('discrete_percent')" prop="discrete_percent">
-              <span v-text="k"></span>
-            </FormItem>
           </div>
         </Col>
       </Row>
@@ -138,7 +145,7 @@ import Api from "./api";
 export default {
   data() {
     return {
-      items:["是否多台","转序规则","加班策略","是否离散"],
+      items:[{name:"是否多台",value:"multiple"},{name:"转序规则",value:"planState"},{name:"加班策略",value:"over"},{name:"是否离散",value:"dis"}],
       entity: {
         partTaskPk: 0,
         opTaskPk: 0,
@@ -154,6 +161,7 @@ export default {
         dis:false,
         isDiscrete: "否",//是否离散 是否
         discrete: 1, //离散数值  必须大于 1
+        discrete_percent:0,
         multiple: false,
         multipleEquip: "否", //"是否多台安排设备", 否  是
         multipleCount: 1, //多台数量
@@ -165,7 +173,7 @@ export default {
       levelRules: [],
       levelMarks: {
         0: "慢",
-        5: "快"
+        4: "快"
       },
       rules: {
         // calId: [
@@ -228,10 +236,12 @@ export default {
   },
   mounted() {
     this.$dragging.$on('dragged', ({ value }) => {
-      console.log(value.item)
-      console.log(value.list)
-      console.log(value.otherData)
+      localStorage.setItem("apsitems",JSON.stringify(value.list));
     })
+    var items=localStorage.getItem("apsitems");
+    if(items){
+      this.items=JSON.parse(items);
+    }
   },
   methods: {
     getCal() {
@@ -254,20 +264,13 @@ export default {
       });
     },
     setParameter(v) {
-      // alert(v)
-      let parameters = this.levelRules[v].prams;
-      parameters.map(u => {
-        if (u.parametersCode == "PlanMethod") {
-          this.entity.planState = u.parameterValue == "平行";
-          this.entity.planMethod = u.parameterValue;
-        } else if (u.parametersCode == "OverTime") {
-          this.entity.over = u.OverTime == "不加班";
-          this.entity.overTime = u.parameterValue;
-        } else if (u.parametersCode == "Discrete") {
-          this.entity.isDiscrete = u.parameterValue == "是";
-          this.entity.isDiscrete = u.parameterValue;
+       this.entity.multiple=false;
+        this.entity.planState=false;        
+        this.entity.over=false;
+        this.entity.dis=false;
+        for(var i=0;i<v;i++){
+          this.entity[this.items[i].value]=true;
         }     
-      });
     },
     handleSubmit() {
       this.$refs.form.validate(valid => {
@@ -310,6 +313,14 @@ export default {
     l(key) {
       let vkey = "mes_op_task_plan_simulate" + "." + key;
       return this.$t(vkey) || key;
+    },
+    setPercent(v){
+      this.entity.discrete=Math.round(((this.count-1)*v-this.count)/100);
+    },
+    setDiscrete(v){
+      this.entity.discrete_percent=(
+          (100 * this.count - 100 * this.entity.discrete) / (this.count - 1)
+        );        
     }
   },
   computed: {

pages/produce/orderlist.vue

@@ -32,12 +32,12 @@
           @click="toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId,row.routingDetailId,row.quantity,row.status)"
         >
           <Row class="title-i">
-            <Col :span="10" class="order-code">{{row.productName}}</Col>
-            <Col :span="10" class="order-code">{{row.mesCode}}</Col>
+            <Col :span="10" class="order-code"><Ellipsis :text="row.productName" :lines="1" tooltip transfer /></Col>
+            <Col :span="10" class="order-code"><Ellipsis :text="row.mesCode" :lines="1" tooltip transfer /></Col>
             <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>