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

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();

i18n/locale/zh-CN.js

@@ -359,7 +359,8 @@ export default {
     productId: '产品id',
     productName: '产品名称',
     quantity: '计划数量',
-    productQuantity: '合格数量',
+   productQuantity: '合格数量',
+    qualifiedQuantity:'合格数量',
     actualFinishDate: '完成时间',
     productingPreparationPeople: '承制单位',
     uncertificateQuantity: '待开具数量',

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/handle/examine9/detail.vue

@@ -35,10 +35,10 @@
           <Col :span="4" class="col-border">数量</Col>
           <Col :span="8" class="col-border">{{results.productQuantity}}</Col>
         </Row>
-        <Row class="row-border right-border">
+        <!-- <Row class="row-border right-border">
           <Col :span="4" class="col-border">增材制造批次号</Col>
           <Col :span="20" class="col-border">{{results.addMaterialBatch}}</Col>
-        </Row>
+        </Row> -->
         <Row class="row-border right-border">
           <Col :span="24" class="col-border content">检验内容</Col>
         </Row>

pages/qc/certificate/endIssued/index.vue

@@ -76,8 +76,8 @@ export default {
         },
 
         {
-          key: "productQuantity",
-          title: this.l("productQuantity"),
+          key: "qualifiedQuantity",
+          title: this.l("qualifiedQuantity"),
           align: "left",
           easy: true,
           high: true

pages/qc/certificate/endIssued/pdfDetail.vue

@@ -42,10 +42,10 @@
           <Col :span="4" class="col-border">数量</Col>
           <Col :span="8" class="col-border">{{results.productQuantity}}</Col>
         </Row>
-        <Row class="row-border right-border">
+        <!-- <Row class="row-border right-border">
           <Col :span="4" class="col-border">增材制造批次号</Col>
           <Col :span="20" class="col-border">{{results.addMaterialBatch}}</Col>
-        </Row>
+        </Row> -->
         <Row class="row-border right-border kk">
           <Col :span="24" class="col-border content">检验内容</Col>
         </Row>

pages/qc/certificate/endIssued/qcInfos.vue

@@ -35,10 +35,10 @@
           <Col :span="4" class="col-border">数量</Col>
           <Col :span="8" class="col-border">{{results.productQuantity}}</Col>
         </Row>
-        <Row class="row-border right-border">
+        <!-- <Row class="row-border right-border">
           <Col :span="4" class="col-border">增材制造批次号</Col>
           <Col :span="20" class="col-border">{{results.addMaterialBatch}}</Col>
-        </Row>
+        </Row> -->
         <Row class="row-border right-border">
           <Col :span="24" class="col-border content">检验内容</Col>
         </Row>

pages/qc/certificate/waitOpened/index.vue

@@ -54,8 +54,8 @@ export default {
         },
 
         {
-          key: 'productQuantity',
-          title: this.l('productQuantity'),
+          key: 'qualifiedQuantity',
+          title: this.l('qualifiedQuantity'),
           align: 'left',
           easy: true,
           high: true