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

pages/aps/aps/components/excute.vue

@@ -35,7 +35,7 @@
 <script>
 import Api from "../api";
 import Edit from "./edit";
-import Add from "../add";
+import Add from "../options";
 export default {
   name: "list",
   components: {

pages/aps/aps/index.vue

@@ -94,7 +94,7 @@
 </template>
 <script>
 import Api from "./api";
-import Add from "./add";
+import Add from "./options";
 import Temp from "./temp";
 import Duration from "./duration";
 import Expand from "./components/excute";

pages/aps/aps/add.vue → pages/aps/aps/options.vue

@@ -171,8 +171,7 @@ export default {
         overTime: "不加班", //"六日加班", 不加班 加班
         efficiencyValue: 11, // 效率系数, 必须大于 0
         shopId: null,
-        isDiscrete: true,
-        isDiscrete: "否",
+        isDiscrete: true,//是否离散 是否
         discrete: 1, //离散数值  必须大于 1
         multiple: true,
         multipleEquip: "是", //"是否多台安排设备", 否  是
@@ -349,24 +348,25 @@ export default {
     },
     opTaskPk(v, n) {
       this.entity.opTaskPk = v;
-      if(v>0){
+      if(v>0){        
+        console.log("detail",this.row);
+        
         let entity={
           partTaskPk: this.row.part_task_pk,
           opTaskPk: this.row.op_task_pk,
           taskSeq: this.row.task_seq,
           flog: 5, //参数应用范围
           calId: null,
-          planState: true,
+          planState: this.row.plan_method=="平行",
           planMethod: this.row.plan_method, // 平行 重叠
-          over: false,
+          over: this.row.over_time=="加班",
           overTime: this.row.over_time, //"六日加班", 不加班 加班
-          efficiencyValue:this.row.efficiency_value, // 效率系数, 必须大于 0
+          efficiencyValue:this.row.efficiency_value|1, // 效率系数, 必须大于 0
           shopId: null,
-          isDiscrete: this.row.isdiscrete,
-          isDiscrete: "否",
-          discrete: this.row.discrete_value, //离散数值  必须大于 1
-          multiple: true,
-          multipleEquip: this.row.multi_machine, //"是否多台安排设备", 否  是
+          isDiscrete: this.row.isdiscrete=="是",
+          discrete: this.row.discrete_value|1, //离散数值  必须大于 1
+          multiple: this.row.multi_machine=="是",
+          multipleEquip: this.row.multi_machine|"否", //"是否多台安排设备", 否  是
           multipleCount: 1, //多台数量
           multipleEquipPks: [],
           multipleEquipIds: "", //"设备id", 用英文逗号分隔

pages/aps/complete/index.vue

@@ -2,13 +2,13 @@
   <div class="scheduling">
     <div class="aps-l">
       <Row class="row-p">
-        <Col :span="6" class="chan-chi">排产池</Col>
-        <Col :span="18" class="l-ringht">
-          <RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small">
-            <Radio label="0">未排产</Radio>
-            <Radio label="2">已排查</Radio>
+        <Col :span="10" class="chan-chi">整机排产-排产池</Col>
+        <Col :span="14" class="l-ringht">
+          <!-- <RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small">
+            <Radio label="0">未排产</Radio> -->
+            <!-- <Radio label="2">已排查</Radio> -->
             <!-- <Radio label="-1">全部</Radio> -->
-          </RadioGroup>
+          <!-- </RadioGroup> -->
         </Col>
       </Row>
       <div class="left-down">
@@ -34,7 +34,7 @@
           <div class="time-s">
             <span>工序：{{li.drawnNumber}}</span>
           </div>
-          <div class="time-s">{{li.demandFinishDate}} — {{li.demandStartDate}}</div>
+          <div class="time-s">{{li.demandFinishDate}} ~ {{li.demandStartDate}}</div>
         </div>
       </div>
     </div>
@@ -205,6 +205,8 @@ export default {
         if (r.success) {
           r.result.map(e => {
             e.checked = false;
+            e.demandFinishDate = e.demandFinishDate.substr(0,10)
+            e.demandStartDate = e.demandStartDate.substr(0,10)
           });
           this.list = r.result;
         }
@@ -371,6 +373,7 @@ export default {
         font-size: 14px;
         font-weight: bold;
         margin-top: 3px;
+        height: 24px;
       }
       .l-ringht {
         text-align: right;

pages/aps/results/index.vue

@@ -28,8 +28,8 @@
           </div>
         </div>
       </Sider>
-      <Content>
-        <Tabs value="name1" :animated="false">
+      <Content class="tab_card_box">
+        <Tabs class="tab_card" value="name1" type="card" :animated="false">
             <TabPane label="结果列表" name="name1">
               <resultsList ref="resultsList"/>
             </TabPane>

pages/aps/results/results.less

@@ -45,7 +45,11 @@
     }
     .ivu-layout-content {
       margin-left: 15px;
-  
+      .tab_card{
+        .ivu-tabs-bar{
+          margin-top: 10px;
+        }
+      }
       .btn {
         float: right;
         margin-top: -52px;

pages/aps/stream/index.vue

@@ -2,13 +2,13 @@
   <div class="scheduling">
     <div class="aps-l">
       <Row class="row-p">
-        <Col :span="6" class="chan-chi">排产池</Col>
-        <Col :span="18" class="l-ringht">
-          <RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small">
-            <Radio label="0">未排产</Radio>
-            <Radio label="2">已排查</Radio>
+        <Col :span="9" class="chan-chi">流水排产-排产池</Col>
+        <Col :span="15" class="l-ringht">
+          <!-- <RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small">
+            <Radio label="0">未排产</Radio> -->
+            <!-- <Radio label="2">已排查</Radio> -->
             <!-- <Radio label="-1">全部</Radio> -->
-          </RadioGroup>
+          <!-- </RadioGroup> -->
         </Col>
       </Row>
       <div class="left-down">
@@ -190,6 +190,8 @@ export default {
         if (r.result) {
           r.result.map(u => {
             u.aps = 0;
+            u.demandFinishDate = u.demandFinishDate.substr(0,10)
+            u.demandStartDate = u.demandStartDate.substr(0,10)
           });
           this.list = r.result;
           // if (r.result[0]) {
@@ -414,6 +416,7 @@ export default {
         font-size: 14px;
         font-weight: bold;
         margin-top: 3px;
+        height: 24px;
       }
       .l-ringht {
         text-align: right;

pages/qc/dataTrace/components/reviewCount.vue

@@ -7,7 +7,7 @@
                         基本信息
                     </MenuItem>
                     <MenuItem name="2" replace>
-                        主工艺
+                        工艺信息
                     </MenuItem>
                     <!-- <MenuItem name="3" replace>
                         专业工艺

pages/resourceManagement/deviceType/index.vue

@@ -147,7 +147,7 @@ export default {
                 {
                   attrs: {
                     oprate: "detail",
-                    class: "edit",
+                    // class: "edit",
                     title: "编辑" 
                   },
                   on: {

pages/test.vue

+<style lang="less">
+.test_layout {
+    height: 50%;
+    .bg1{
+        background:#fefefe ;
+    }
+  .fg {
+    background-color: rgba(234,45,198, 1);
+    overflow: auto;
+  }
+}
+.layout-copy {
+  text-align: center;
+  padding: 10px 0 20px;
+  color: #9ea7b4;
+}
+</style>
+<template>
+  <div class="flex fd test_layout">
+    <div>
+      <Menu mode="horizontal" active-name="1">
+        <div class="layout-assistant">
+          <MenuItem name="1">Option 1</MenuItem>
+          <MenuItem name="2">Option 2</MenuItem>
+          <MenuItem name="3">Option 3</MenuItem>
+        </div>
+      </Menu>
+    </div>
+    <div class="fg">
+        <h4 v-for="i in 200">
+            {{i}}内容部分
+        </h4>
+        </div>
+        <div>
+            这是一个问题
+        </div>
+  </div>
+</template>
+<script>
+export default {
+  layout: "empty"
+};
+</script>
\ No newline at end of file