Merge branch 'master' of git.mes123.com:zhouyx/mes-ui

pages/aps/aps/api.js

@@ -76,4 +76,12 @@ export default {
    userdepartmentsofworkshop(params) {
     return Api.get(`${systemUrl}/user/userdepartmentsofworkshop`, params);
   },
+  //获取班组  /mes_equip_info/getequiptypelist
+  getUserDepart(params) {
+    return Api.get(`${systemUrl}/user/userdepartmentsofworkshop`, params);
+  },
+  //获取设备
+  getEquiptypeList(params) {
+    return Api.get(`${apsUrl}/mes_equip_info/getequiptypelist`, params);
+  },
 }

pages/aps/aps/components/edit.vue

@@ -11,37 +11,50 @@
           <Input></Input>
         </FormItem>
       </Col>
-      <Col :span="12">
-        <FormItem :label="l('sHOPID')" prop="sHOPID">
+      <Col :span="12"> 
+        <FormItem label="班组" prop="sHOPID">
            <!-- v-model="orderSearchForm.orderCat" -->
-          <Select >
-              <Option value="" class="option-text">请选择</Option>
-              <Option v-for="item in orderCatList"   :value="item" :key="item">{{ item }}</Option>
+          <Select v-model="entity.department_id">
+              <Option
+                v-for="(item,index) in list"
+                :key="index"
+                :value="item.value"
+                style="display:none"
+                :label="item.label"
+              ></Option>
+              <Tree key="mytree" :data="orderCatList" ref="mytree" :render="renderContent"></Tree>
+              <!-- <Option v-for="(item,index) in orderCatList"   :value="item.title" :key="index">{{ item.title }}</Option> -->
           </Select>
         </FormItem>
       </Col>
       <Col :span="12">
-        <FormItem :label="l('eQUIPID')" prop="eQUIPID">
-          <Select >
-              <Option value="" class="option-text">请选择</Option>
-              <Option v-for="item in orderCatList"   :value="item" :key="item">{{ item }}</Option>
+        <FormItem label="首选设备" prop="eQUIPID">
+          <Select placeholder="编号 / 名称">
+              <Option value="" class="option-text">编号 / 名称</Option>
+              <Option v-for="(item,index) in equiptypeList"   :value="item.id" :key="index">{{ item.equipTypeName }}</Option>
           </Select>
         </FormItem>
       </Col>
-      <Col :span="12">
-        <FormItem label="关重资源名称" prop="rUNTIME">
+      <!-- <Col :span="12">
+        <FormItem label="资源名称" prop="rUNTIME">
           <Select >
               <Option value="" class="option-text">请选择</Option>
               <Option v-for="item in orderCatList"   :value="item" :key="item">{{ item }}</Option>
           </Select>
         </FormItem>
-      </Col>
+      </Col> -->
       <Col :span="12">
         <FormItem :label="l('rUNTIME')" prop="rUNTIME">
            <!-- v-model="value1" -->
           <InputNumber :max="100" :min="1"></InputNumber>
         </FormItem>
       </Col>
+      <Col :span="12">
+        <FormItem>
+           <!-- v-model="single" -->
+          <Checkbox>  是否同步到原始工艺</Checkbox>
+        </FormItem>
+      </Col>
     </Row>
     <FormItem>
       <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
@@ -56,20 +69,26 @@ export default {
   data() {
     return {
       disabled: false,
-      entity: {},
-      orderCatList:[
-
-      ],
+      entity: {
+        department_id: null, //班组
+      },
+      list:[],
+      selectdata: [],
+      orderCatList:[],//班组
+      equiptypeList:[],//设备
       rules: {
         name: [{ required: true, message: '必填', trigger: 'blur' }]
       }
     }
   },
   props: {
-    eid: Number
+    eid: Number,
+  },
+  created() {
+    // this.getUserDepart()
   },
   methods: {
-    load(v) {
+    load() {
       //   Api.get({ id: v }).then((r) => {
       //     this.entity = r.result
       //     this.$emit('on-load')
@@ -97,6 +116,41 @@ export default {
         }
       })
     },
+    renderContent(h, { root, node, data }) {
+      //渲染树的样式
+      return h(
+        "span",
+        {
+          style: {
+            // color: data.isProduct != "1" ? "#249E91" : "#333", //根据选中状态设置样式
+            cursor: "pointer"
+          },
+          on: {
+            click: () => {
+              let arrTree = [];
+              arrTree.push(data);
+              this.handleSelect(arrTree); //手动选择树节点
+            }
+          }
+        },
+        data.title
+      );
+    },
+    handleSelect(data) {
+      if (data.length > 0) {
+        this.selectdata = [];
+        this.selectdata = data;
+        this.list = [];
+        this.list.push({ label: data[0].title, value: data[0].id });
+        // if (data[0].isProduct == "1") {
+        //   this.orderSearchForm.productName = data[0].title;
+        //   this.orderSearchForm.productId = data[0].productId;
+        //   this.orderSearchForm.drawnNumber = data[0].drawingNo;
+        // } else {
+        //   this.$Message.error("此节点不是产品,请选择产品节点!");
+        // }
+      }
+    },
     handleClose() {
       this.$emit('on-close')
     },

pages/aps/aps/components/excute.vue

@@ -14,7 +14,7 @@
     ></DataGrid>
 
     <Modal v-model="editModal" title="编辑" footer-hide width="800">
-      <Edit :eid="curId" @on-close="cancel" />
+      <Edit ref="editPart" :eid="curId" @on-close="cancel" />
     </Modal>
     <Modal v-model="insertlModal" title="插单" @on-ok="insertOk" @on-cancel="cancel">
       <p>确定进行 {{insertTItle}} 操作？</p>
@@ -390,6 +390,22 @@ export default {
     edit(id) {
       this.editModal = true;
       this.curId = Number(id);
+      this.getUserDepart()
+      this.getEquiptypeList()
+    },
+    // 获取班组
+    getUserDepart(){
+      Api.getUserDepart().then(res=>{
+        console.log(res.result)
+        this.$refs.editPart.orderCatList = res.result
+      })
+    },
+    // 获取设备
+    getEquiptypeList(){
+      Api.getEquiptypeList().then(res=>{
+        console.log("设备",res.result)
+        this.$refs.editPart.equiptypeList = res.result
+      })
     },
     //编辑工序end----
 

pages/aps/aps/index.vue

@@ -253,7 +253,8 @@ export default {
         if (res.success) {
           this.list = res.result;
         }
-      });
+      });  
+       
     },
     addOk() {
       this.$refs.grid.load();
@@ -330,6 +331,14 @@ export default {
     openParms(id) {
       this.addModal = true;
     },
+    getUserDepart(){
+      alert("5656565")
+      // Api.getUserDepart().then(res=>{
+      //   console.log("11111",res)
+      //   return res
+      // })
+    },
+    
     l(key) {
       let vkey = "mes_part_task_plan_simulate" + "." + key;
       return this.$t(vkey) || key;

pages/basicData/userManagent/userInfo.vue

 <template>
   <div>
-    <Card style="width:350px;float:left">
+    <Card class="img_top01">
       <p slot="title">个人头像</p>
       <div style="height:415px;">
         <p style="text-align:center;padding-top:100px;">
@@ -267,8 +267,17 @@ export default {
 };
 </script>
 <style  lang="less" >
-.ivu-card-body {
-  padding: 0px;
+.img_top01{
+  width:350px;
+  float:left;
+  .ivu-card-body {
+    padding: 0px;
+  }
+}
+.user_info_right{
+  .ivu-card-body {
+    padding: 0px;
+  }
 }
 .ivu-tabs-nav-scroll {
   background: #f5f6fa;