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

api/order.js

@@ -99,6 +99,9 @@ export default {
             SimpleSearch: typeof (params) == 'string' ? params : params.simpleSearch, //快速搜索
             SkipCount: params.SkipCount ? params.SkipCount : 0,
             MaxResultCount: params.MaxResultCount ? params.MaxResultCount : 20,
+            projectNumber: params.projectNumber, //项目号
+            batchNumber: params.batchNumber, //批次号
+            urgencyLevel: params.urgencyLevel, //紧急程度
         };
         return Api.get(`${PlanUrl}/mesorder/getpagedmesorders`, model);
     },

components/modalTree/storeHouseLeft.vue

@@ -48,13 +48,13 @@ export default {
       ///浏览器窗口大小变化
       return (() => {
         window.screenHeight = window.innerHeight;
-        this.divHeight = window.innerHeight - 180 + "px";
+        this.divHeight = window.innerHeight - 260 + "px";
       })();
     };
   },
   created() {
     this.loadTree()
-     var theight = window.innerHeight - 180 + 'px'
+     var theight = window.innerHeight - 260 + 'px'
     this.divHeight = theight
   },
   methods: {

i18n/locale/zh-CN.js

@@ -1045,7 +1045,7 @@ export default {
         insert_flag: '插单',
         important_flag:"插单",
         outside_time: '外协时间',
-        discrete_percent: '离散百分比%',
+        discrete_percent: '离散度',
         taskseq_des: '',
         workshopcode: '',
         routing_detail_id: '',

layouts/basic-layout/product.vue

@@ -7,6 +7,13 @@
           <Icon type="ios-keypad" />
           <div class="top_menu_box">
             <table class="t_table_box">
+              <tr>
+                <td class="t_title">
+                  <a class="a_goIndex" @click="goIndex">
+                    <b class="title">首页</b>
+                  </a>
+                </td>
+              </tr>
               <tr v-for="(item,i) in filterSider">
                 <td class="t_title">
                   <b class="title"
@@ -277,6 +284,9 @@ export default {
       this.$router.push(u.path)
       this.isActive = u.id
     },
+    goIndex(){
+      this.$router.push("/")
+    },
   },
   mounted() {
     document.addEventListener("scroll", this.handleScroll, { passive: true });
@@ -382,6 +392,9 @@ export default {
           .t_title{
             min-width: 120px;
             background: #515a6e;
+            .a_goIndex{
+              color: #fff;
+            }
             .title{
               padding: 5px 10px;
             }

pages/aps/aps/components/edit.vue

@@ -66,7 +66,12 @@ export default {
     }
   },
   props: {
-    eid: Number
+    row: {
+      type:Object,
+      default:()=>{
+        return null
+      }
+    }
   },
   methods: {
     load(v) {
@@ -84,7 +89,7 @@ export default {
               this.disabled = false
               if (r.success) {
                 this.$Message.success('保存成功')
-                this.$emit('on-ok')
+                this.$emit('on-option-ok')
               } else {
                 this.$Message.error('保存失败')
               }

pages/mordent/Sluggish/placode/index.vue

@@ -4,7 +4,7 @@
       <StoreHouseLeft @storeIds="storeIds" :type='2'></StoreHouseLeft>
     </Sider>
     <Content class="content">
-      <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch">
+      <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :height="tdHeight">
         <template slot="searchForm">
           <Search />
         </template>
@@ -82,6 +82,7 @@ export default {
       deletelModal: false,
       setNumModal: false,
       inventoryModal: false,
+      tdHeight:0,
       curId: 0,
       easySearch: {
         keys: { op: 'code,name', value: '', default: true },
@@ -256,7 +257,7 @@ export default {
   },
   mounted() {},
   created() {
-    
+    this.tdHeight = window.innerHeight - 260
   },
   methods: {
     addOk() {

pages/mordent/Sluggish/powder/index.vue

@@ -15,7 +15,8 @@
         ref="grid" 
         :conditions="easySearch" :datalist="dataList" :total="ptotal"
         placeholder="请输入查询条件"
-        :high="true" >
+        :high="true"
+        :height="tdHeight" >
         <template slot="searchForm">
           <Search />
         </template>
@@ -103,6 +104,7 @@ export default {
       deletelModal: false,
       setNumModal: false,
       inventoryModal: false,
+      tdHeight:0,
       curId: 0,
       easySearch: {
         keys: { op: 'code,name', value: '', default: true },
@@ -165,7 +167,7 @@ export default {
     }
   },
   mounted() {},
-  created() {},
+  created() {this.tdHeight = window.innerHeight - 260},
   methods: {
     addOk() {
       this.addModal = false