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

assets/css/base.less

@@ -964,7 +964,13 @@ html [type=button] {
             font-weight: bold;
             font-size: 24px;
             color: #249e91;
+        };
+        .ivu-icon-ios-cog{
+            font-weight: bold;
+            font-size: 24px;
+            color: #249e91;
         }
+
     }
 }
 

layouts/basic-layout/header-user/index.vue

@@ -7,6 +7,7 @@
       @on-click="handleClick"
     >
       <Avatar size="small" :src="info.avatar" v-if="info.avatar" />
+      <Avatar size="small" style="background-color: #87d068" v-else-if="!info.avatar"  icon="ios-person" />
       <span class="i-layout-header-user-name" v-if="!isMobile">{{ info.name }}</span>
       <DropdownMenu slot="list">
         <i-link to="/basicData/userManagent/userInfo">
@@ -35,7 +36,7 @@ import { mapState, mapActions } from "vuex";
 export default {
   name: "iHeaderUser",
   computed: {
-    ...mapState("admin/user", ["info"]),
+    ...mapState("admin/user", ["info"]),    
     ...mapState("admin/layout", ["isMobile", "logoutConfirm"])
   },
   methods: {

pages/aps/dispatch/dispatch.less

@@ -53,26 +53,22 @@
             // padding-right: 0!important;
             .man_body{
                 max-width: 185px;
-                label{
+                .checkUser{
                     border-radius: 24px;
                     width: 100%;
                     height: 50px;
                     line-height: 47px;
-                    span.ivu-checkbox{
-                        .ivu-checkbox-inner{
-                            margin-top: -42px!important;
-                        }
-                    }
                     span{
-                        // overflow: hidden; 
-                        // text-overflow: ellipsis; 
-                        // -o-text-overflow: ellipsis;
-                        // white-space:nowrap;
-                        // display: inline-block;
                         height: 50px;
                     }
                     .svg_name{
-                        width: 50px;
+                        overflow: hidden; 
+                        text-overflow: ellipsis; 
+                        -o-text-overflow: ellipsis;
+                        white-space:nowrap;
+                        display: block;
+                        float: right;
+                        width: 82%;
                     }
                     .svg{
                         width: 70px;

pages/aps/dispatch/index.vue

@@ -99,12 +99,14 @@
               <!-- {{peploeId}} @on-change="setpepoleid" @on-change="setpepoleids"-->
               <Row :gutter="15">
                 <Col span="8" class="dispatch_card02" v-for="(item,index) in listMan" :key="index">
-                  <CheckboxGroup class="man_body">
-                    <Checkbox v-model="item.checked" border  class>
-                      <span class="svg_name">{{item.userName}}</span>
-                      <span class="svg">{{item.id}}</span>
-                    </Checkbox>
-                  </CheckboxGroup>
+                  <!-- <Tooltip :content="item.userName"> -->
+                    <CheckboxGroup class="man_body">
+                      <Checkbox v-model="item.checked" border  class='checkUser'>
+                        <span class="svg_name" :title='item.userName'>{{item.userName}}</span>
+                        <!-- <span class="svg">{{item.id}}</span> -->
+                      </Checkbox>
+                    </CheckboxGroup>
+                  <!-- </Tooltip> -->
                 </Col>
               </Row>
             </div>

pages/aps/results/api.js

@@ -17,7 +17,4 @@ export default {
     processschemedispatch(params) {
         return Api.post(`${apsUrl}/apspoolappservices/processschemedispatch`, params);
     },
-    moveintoaps() {//跳转进入排产池前判断
-        return Api.post(`${PlanUrl}/messchedule/moveintoaps`);
-    },
 }

pages/aps/results/index.vue

@@ -66,14 +66,14 @@ export default {
         },
         {
           title: "超期预警",
-          key: "id",
+          key: "alert",
           align: "center",
           render: (h, params) => {
             return h("div", [
               h("Icon", {
                 props: {
                   type:
-                    params.row.id == 1
+                    params.row.alert == true
                       ? "ios-information-circle-outline"
                       : "ios-remove-circle-outline"
                 },
@@ -81,7 +81,7 @@ export default {
                   marginRight: "5px",
                   fontSize: "18px",
                   fontWeight: "bold",
-                  color: params.row.id == 1 ? "#FE7777" : "#0DD78D"
+                  color: params.row.alert == true ? "#FE7777" : "#0DD78D"
                 }
               })
             ]);
@@ -89,7 +89,7 @@ export default {
         },
         {
           title: "零件图号",
-          key: "part_number",
+          key: "part_id",
           align: "center"
         },
         {
@@ -175,7 +175,6 @@ export default {
               if (r.success) {
                 this.$Message.success("清空列表成功");
                 this.orderlist();
-                this.data = [];
               }
             });
           },
@@ -193,7 +192,6 @@ export default {
         if (r.result) {
           this.$Message.success(r.result.retmsg);
           this.orderlist();
-          this.data = [];
         } else {
           this.$Message.success("下发失败");
         }
@@ -201,19 +199,6 @@ export default {
     },
     comeBlck() {
       this.$router.push({ path: "/aps/aps" });
-      Api.moveintoaps().then(res => {
-        if (res.success) {
-          if (res.result.res) {
-            this.$router.push({
-              name: "aps-aps"
-            });
-          } else {
-            this.$router.push({
-              name: "aps-plan"
-            });
-          }
-        }
-      });
     }
   }
 };
@@ -240,6 +225,7 @@ export default {
     line-height: 38px;
     border-bottom: 1px solid #e4e6ed;
     margin-bottom: 15px;
+    margin-right: 15px;
   }
   .left-body:hover {
     cursor: pointer;
@@ -268,6 +254,7 @@ export default {
     .btn {
       float: right;
       margin-top: -52px;
+      margin-right: 15px;
     }
   }
 }

pages/basicData/userManagent/userInfo.vue

@@ -4,7 +4,8 @@
       <p slot="title">个人头像</p>
       <div style="height:415px;">
         <p style="text-align:center;padding-top:100px;">
-          <Avatar :src="avatorPath" size="150" />
+          <Avatar :src="avatorPath" size="150"  v-if="avatorPath" />
+          <Avatar size="150" style="background-color: #87d068" v-else-if="!avatorPath"  icon="ios-person" />
         </p>
         <p style="text-align:center;padding:10px;">
           <Button @click="openModalAvatar">修改头像</Button>

pages/crm/statistical/index.vue

@@ -5,7 +5,8 @@
     <div class="statistical_box">
         <div class="statistical_top">
             <div class="user_img fl">
-                <Avatar :src="avatorPath" size="90" />
+                <Avatar :src="avatorPath" size="90" v-if="avatorPath" />
+                <Avatar size="90" style="background-color: #87d068" v-else-if="!avatorPath"  icon="ios-person" />
             </div>
             <div class="user_info fl">
                 <h3 class="mb10">您好，{{userData.userName}}，欢迎登录MES系统 !</h3>

pages/order/monitoring/record.vue

 <template>
   <div class="record">
-    <DataGrid :columns="columns" ref="grid" :action="action" :tool="false"></DataGrid>
+    <DataGrid :columns="columns" ref="grid" :action="action" :tool="false" :height="820"></DataGrid>
     <Modal v-model="detailModal" title="详情" width="800">
       <Detail :eid="curId" />
     </Modal>

pages/order/monitoring/speed.vue

 <template>
   <div class="record">
-    <Table :columns="columns" :data="result" border></Table>
+    <DataGrid :columns="columns" :data="result" border :tool='false' :height="820"></DataGrid>
   </div>
 </template>
 <script>
@@ -97,9 +97,8 @@ export default {
 
         {
           key: "status",
-          type: "user",
-          title: this.l("status"),
-          code: "plan.order.status",
+          title: '工单状态',
+          code: "taskList.status",
           align: "center"
         }
       ]

pages/processManage/Process/processMain.vue

@@ -43,13 +43,13 @@
         inline
       >
         <Row>
-          <FormItem :label="l('code')"  prop="code">
+          <FormItem :label="l('code')"  >
             <Input
               size="large"
               v-model.trim="formValidate.code"
               placeholder="请输入..."
               style="width:240px"
-              :disabled="isview"
+              disabled="true"
             />
           </FormItem>
           <FormItem :label="l('name')"  prop="name">
@@ -183,9 +183,9 @@ export default {
       RoutingList: {},
       components: {},
       ruleValidate: {
-        // code: [
-        //   { required: true, message: '工艺文件编号不能为空', trigger: 'blur' }
-        // ],
+        code: [
+          { required: true, message: '工艺文件编号不能为空', trigger: 'blur' }
+        ],
         // number:[{required: true,type:'number'}],
         name: [
           { required: true, message: '工艺文件名称不能为空', trigger: 'blur' }
@@ -199,7 +199,6 @@ export default {
       isview: false,
       isshow: false,
       ischangeshow: false,
-
       selectpdefmid: 0,
       oldformValidate: {},
       processList: [],

pages/processManage/setProcess/components/orderMaterial.vue

@@ -460,13 +460,14 @@ export default {
           } else {
             this.isview = false;
           }
+          if (this.formValidate.status == 1) {
+            this.isview = false;
+          }
           this.codeisview = true;
           this.formValidate1 = response.result.orderMaterialList;
 
           for (let i = 0; i < this.formValidate1.length; i++) {
             let obj = this.formValidate1[i];
-            
-            
           }
         });
       } else {
@@ -481,9 +482,9 @@ export default {
           this.isview = false;
           this.formValidate1 = response.result.orderMaterialList;
 
-           for (let i = 0; i < this.formValidate1.length; i++) {
+          for (let i = 0; i < this.formValidate1.length; i++) {
             let obj = this.formValidate1[i];
-            
+
             obj.quantity = obj.quantity * this.dataTop[0].quantity;
           }
         });
@@ -588,17 +589,17 @@ export default {
         }, 5);
         return;
       }
- this.formprocessValidate.quantity=this.formprocessValidate.singlequantity *this.dataTop[0].quantity;
-        
-      if (this.formValidate.id == 0) {
+      this.formprocessValidate.quantity =
+        this.formprocessValidate.singlequantity * this.dataTop[0].quantity;
 
+      if (this.formValidate.id == 0) {
         if (this.editindex == -1) {
-           let curData = {};
+          let curData = {};
           curData = JSON.parse(JSON.stringify(this.formprocessValidate));
 
           this.formValidate1.push(curData);
         } else {
-           let curData = {};
+          let curData = {};
           curData = JSON.parse(JSON.stringify(this.formprocessValidate));
 
           this.formValidate1[this.editindex] = curData;

pages/processManage/setProcess/index.vue

@@ -633,9 +633,13 @@ export default {
                   });
                 }
               }
+             
               if (gh != null && gh.length > 0) {
                 content1 = gh[0].name;
                 editColor1 = gh[0].color;
+              } if(params.row.materialbillStatus>1)
+              {
+                 content1 = "查看";
               }
               return h("div", [
                 h(

pages/resourceManagement/EquipmentCalendar/components/newEquipment.vue

@@ -20,7 +20,7 @@
           <Col span="20">
             <FormItem label="工作日历"  prop="work">
               <Select v-model="formItem1.calendarwork_pk" clearable placeholder="请选择...">
-               <Option v-for="item in cityList" :value="item.id" :key="item.value">{{ item.label }}</Option> 
+               <Option v-for="item in cityList" :value="item.id" :key="item.calName">{{ item.calName }}</Option> 
               </Select>
             </FormItem>
           </Col>
@@ -29,7 +29,7 @@
           <Col span="20" >
             <FormItem label="加班日历" prop="overtime">
               <Select v-model="formItem2.calendarovertime_pk" clearable placeholder="请选择...">
-              <Option v-for="item in cityList1" :value="item.id" :key="item.value">{{ item.label }}</Option> 
+              <Option v-for="item in cityList1" :value="item.id" :key="item.holidayCalName">{{ item.holidayCalName }}</Option> 
               </Select>
             </FormItem>
           </Col>
@@ -106,37 +106,26 @@ export default {
         },
             laodaction(){
           let parmse ={
-              pageIndex:0,
-              cont:0,
+              pageIndex:1,
               conditions: [],
-              pageSize: 0
+              pageSize: 10
           }
-            let url = `${systemUrl}/calendarwork/list`,
-                that = this;
+            let url = `${systemUrl}/mesdailyworksched/list`;//paged
+                // that = this;
             service.post(`${url}`, parmse).then(res => {
-                let selectdata = res.result;
-                 //console.log(selectdata)
-                selectdata.forEach(item => {
-                    that.cityList.push({
-                        value: item.title,
-                        label: item.title,
-                        id: item.id,
-                    })
-                    // console.log(that.cityList)
-                });
+              if(res.success){
+                this.cityList = res.result;
+              }else{
+                this.$Message.error("获取数据失败...")
+              }
             });
-            let url1 = `${systemUrl}/calendarovertime/list`;
+            let url1 = `${systemUrl}/mesholidaycal/list`;
             service.post(`${url1}`,parmse).then(res => {
-                let selectdata1 = res.result;
-                 console.log(selectdata1)
-                selectdata1.forEach(item => {
-                    this.cityList1.push({
-                        value: item.title,
-                        label: item.title,
-                        id: item.id,
-                    })
-                    // console.log(that.cityList)
-                });
+                if(res.success){
+                  this.cityList1 = res.result;
+                }else{
+                  this.$Message.error("获取数据失败...")
+                }
             });
         },
     preservation() {},
@@ -146,9 +135,9 @@ export default {
     // 添加/编辑 弹框的保存
     saveOk() {
       var url = `${systemUrl}/equipcalendarwork/createorupdate`
-       console.log(this.formItem1)
-          console.log(this.formItem2)
-          console.log(this.editId)
+      //  console.log(this.formItem1)
+      //     console.log(this.formItem2)
+      //     console.log(this.editId)
       service.post(`${url}`,{ equipCalendarWork: this.formItem1,equipCalendarOverTime: this.formItem2 })
         .then((res) => {
 

pages/resourceManagement/EquipmentCalendar/index.vue

@@ -19,7 +19,7 @@
               clearable
               style="width:235px;flaot:left;"
             />
-            <Button type="primary" class @click="easySearch">查询</Button>
+            <Button type="primary" class="ml10" @click="easySearch">查询</Button>
             <!-- <Button @click="advancedSearch" type="success" style="margin-left:8px;">高级搜索</Button> -->
           </Col>
           <!-- <Col span="12" style=" text-align: right;">
@@ -46,7 +46,7 @@
           :total="this.total"
           :current="this.page"
           :page-size="this.pageSize"
-          show-elevator
+          show-elevator show-total
           show-sizer
           style="margin:10px 0;"
           @on-change="pageChange"
@@ -498,7 +498,7 @@ export default {
         },
         {
           title: "工作日历编号",
-          key: "calendarwork_pk"
+          key: "calId"
         },
         {
           title: "工作日历名称",
@@ -506,7 +506,7 @@ export default {
         },
         {
           title: "加班日历编号",
-          key: "calendarovertime_pk"
+          key: "holidayCalId"
         },
         {
           title: "加班日历名称",