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

components/page/dataGrid.vue

@@ -272,7 +272,7 @@ export default {
     if (this.lazy == true) {
       return;
     }
-    if (this.userId > 0) {
+    if (this.userId > 0&& this.set) {
       this.loadUserConfig();
     } else {
       this.easySearch();

pages/aps/aps/options.vue

@@ -353,7 +353,7 @@ export default {
           partTaskPk: this.row.part_task_pk,
           opTaskPk: this.row.op_task_pk,
           taskSeq: this.row.task_seq,
-          flog: 5, //参数应用范围
+          flog: 0, //参数应用范围
           calId: -1,
           planState: this.row.plan_method=="平行",
           planMethod: this.row.plan_method, // 平行 重叠

pages/aps/plan/index.vue

@@ -38,7 +38,7 @@
           type="info"
           v-if="showAi"
         >
-          <a href="javascript:;">智能排产&nbsp;&nbsp;&nbsp;</a>
+          <a>智能排产&nbsp;&nbsp;&nbsp;</a>
         </Badge>
         <Badge
           :count="this.$store.state.countAll"
@@ -47,16 +47,17 @@
           type="info"
           v-if="showAll"
         >
-          <a href="javascript:;" @click="goCemplate">整机排产&nbsp;&nbsp;&nbsp;</a>
+          <a @click="goCemplate">整机排产&nbsp;&nbsp;&nbsp;</a>
         </Badge>
         <Badge :count="this.$store.state.countRun" overflow-count="99" type="info" v-if="showRun">
-          <a href="javascript:;" @click="goStream">流水排产&nbsp;&nbsp;&nbsp;</a>
+          <a  @click="goStream">流水排产&nbsp;&nbsp;&nbsp;</a>
         </Badge>
       </template>
       <template slot="searchForm">
         <Search />
       </template>
-      <template slot="buttons"></template>
+      <template slot="buttons">
+      </template>
     </DataGrid>
     <FooterToolbar extra v-if="footerBar">
       <Row>
@@ -148,6 +149,8 @@ export default {
       curId: 0,
       columns: [
         {
+          key:"selection",
+          title:'#',
           type: "selection",
           width: 70,
           align: "center"
@@ -562,7 +565,10 @@ export default {
         name: "aps-stream"
       });
     },
-
+    add(){
+      this.addModal=true;
+      
+    },
     addOk() {
       this.$refs.grid.load();
       this.addModal = false;

pages/technology/processview.vue

@@ -47,7 +47,7 @@
             </Row>
             <Row class="table_row">
               <Col span="3">
-                <div class="row_label">工艺文件版本</div>
+                <div class="row_label">工艺版本</div>
               </Col>
               <Col span="9">
                 <div class="iview_cont">