Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

ys_vue/src/views/Home.vue

@@ -224,7 +224,10 @@
             },
             //读取消息提示
             loadNotice() {
-            this.http.post( this.port.notice.list, {},
+            this.http.post( this.port.notice.list, {
+                pageNum: 1,
+                pageSize: 5
+            },
                 res => {
                     if (res.code == "ok") {
                         this.popoverData = res.data.list;

ys_vue/src/views/detection/maintenance.vue

@@ -8,13 +8,16 @@
         </el-form-item>
         <el-form-item class="divLine"></el-form-item>
         <el-form-item>
-          当前保养状态：
-          <span style="color: #ff4949; margin-right: 16px;">需要</span>
-          <el-button size="small" type="primary" v-if="requirement" @click="showMaintenance">立即处理</el-button>
+          {{mouldName}}
         </el-form-item>
         <el-form-item style="float:right;">
           保养提醒：
-          <el-switch v-model="prompt" active-color="#ff4949" disabled></el-switch>
+          <el-switch v-model="prompt" active-color="#ff4949"></el-switch>
+        </el-form-item>
+        <el-form-item style="float: right">
+          当前保养状态：
+          <span style="color: #ff4949; margin-right: 16px;">需要</span>
+          <el-button size="small" type="primary" v-if="requirement" @click="showMaintenance">立即处理</el-button>
         </el-form-item>
       </el-form>
     </el-col>
@@ -64,27 +67,39 @@
         class="demo-form-inline"
       >
         <el-form-item label="保养类型" prop="type">
+          <!-- 保养类型选择 -->
+          <el-select v-model="type.value" filterable placeholder="请选择保养类型" style="width:202px">
+            <el-option
+              v-for="item in type"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <!-- 保养类型为1时 选择易损件ID -->
+        <el-form-item v-if="type.value == 1" label="选择易损件" prop="action">
           <el-select
-            v-model="maintenanceForm.type"
+            v-model="action.value"
             clearable
             filterable
-            placeholder="动作"
+            placeholder="请选择易损件"
             style="width:202px"
           >
             <el-option
-              v-for="item in type"
+              v-for="item in vulnerable"
               :key="item.value"
               :label="item.label"
               :value="item.value"
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="选择动作" prop="action">
+        <!-- 保养类型为0时 选择保养动作 -->
+        <el-form-item v-else label="选择动作" prop="action">
           <el-select
             v-model="maintenanceForm.action"
-            clearable
             filterable
-            placeholder="喷油"
+            placeholder="请选择动作"
             style="width:202px"
           >
             <el-option
@@ -95,9 +110,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="保养提醒">
-          <el-switch v-model="prompt" active-color="#ff4949"></el-switch>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click.native="maintenanceFormVisible = false">取消</el-button>
@@ -114,6 +126,8 @@ export default {
     return {
       //本页模具ID
       mouldId: null,
+      //模具名字
+      mouldName: null,
       options: [{ value: "aaa", label: "123" }, { value: "bbb", label: "456" }],
       //记录
       records: [],
@@ -129,15 +143,14 @@ export default {
       tableHeight: 0,
       formRules: {},
       //保养界面 种类
-      type: [
-        { label: "动作", value: 0 },
-        { label: "易损件", value: 1 }
-      ],
+      type: [{ label: "动作", value: 0 }, { label: "易损件", value: 1 }],
       //保养界面 动作
-      action: [
-        { label: "喷油", value: 0 },
-        { label: "喷水", value: 1 },
-        { label: "喷可乐", value: 2 }
+      action: [{ label: "喷漆", value: 0 }, { label: "检查", value: 1 }],
+      //易损件
+      vulnerable: [
+        { label: "易损件1", value: 0 },
+        { label: "易损件12450", value: 1 },
+        { label: "易损件114514", value: 2 }
       ],
       //是否需要保养 提示
       requirement: true,
@@ -203,11 +216,46 @@ export default {
         }
       );
     },
+    //模具详情 获取模具名字用的
+    getDetail() {
+      this.http.post(
+        this.port.mold.moldDetail,
+        {
+          id: this.mouldId
+        },
+        res => {
+          if (res.code == "ok") {
+            this.mouldName = res.data.vo.modelName;
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "error"
+            });
+          }
+        },
+        error => {
+          this.$message({
+            message: error,
+            type: "error"
+          });
+        }
+      );
+    },
     //模具保养 N/A
     maintain() {
+      var param = {
+        mouldId: this.mouldId,
+        maintainType: this.type.value,
+        ways: null
+      };
+      if (param.maintainType == 0) {
+        param.ways = this.action.value;
+      } else {
+        param.ways = null; //后面应该换成易损件的ID
+      }
       this.http.post(
         this.port.mold.moldMaintain,
-        {},
+        param,
         res => {
           if (res.code == "ok") {
             this.$message({
@@ -237,7 +285,8 @@ export default {
   },
   mounted() {
     this.mouldId = this.$route.params.id; //传到当前页面的模具编号
-    this.getList();
+    // this.getList();
+    this.getDetail();
   }
 };
 </script>

ys_vue/src/views/mold/moldDetail.vue

@@ -729,7 +729,6 @@
                 } else if(num == 5) {
                     this.documents.abandon = array;
                 }
-
             },
 
             //打开审批窗口