又弄了一个页面

ys_vue/src/routes.js

@@ -19,6 +19,7 @@ import moldDownload from './views/mold/moldDownload.vue'
 import role from './views/base/role.vue'
 import comp from './views/base/comp.vue'
 import factory from './views/base/factory.vue'
+import allocation from './views/base/allocation.vue'
 
 let routes = [
     {
@@ -84,7 +85,8 @@ let routes = [
         children: [
             // { path: '/role', component: role, name: '角色管理' },
             { path: '/comp', component: comp, name: '公司管理' },
-            { path: '/factory', component: factory, name: '工厂管理' }
+            { path: '/factory', component: factory, name: '工厂管理' },
+            { path: '/allocation', component: allocation, name: '分配云模' }
         ]
     },
     {

ys_vue/src/views/base/allocation.vue

@@ -0,0 +1,163 @@
+<template>
+  <section>
+    <!--工具条-->
+    <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
+      <el-form :inline="true" :model="filters">
+        <el-form-item style="float: left;">公司</el-form-item>
+        <el-col :span="3">
+          <el-form-item>
+            <el-select v-model="filters.value" placeholder="按公司筛选">
+              <el-option label="编号" value="0"></el-option>
+              <el-option label="名称" value="1"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-form-item>
+          <el-input v-model="filters.name" placeholder="请输入关键字进行搜索"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary">查询</el-button>
+        </el-form-item>
+        <el-form-item style="float: right;">
+          <el-button type="primary" @click="showAllocation">分配云模</el-button>
+        </el-form-item>
+      </el-form>
+    </el-col>
+
+    <!--列表-->
+    <el-table
+      :data="allocations"
+      :height="tableHeight"
+      highlight-current-row
+      v-loading="listLoading"
+      style="width: 100%;"
+    >
+      <el-table-column type="index" width="60"></el-table-column>
+      <el-table-column prop="deviceNumber" label="云模设备号" width="120" sortable></el-table-column>
+      <el-table-column prop="power" label="电量" width="80" sortable></el-table-column>
+      <el-table-column prop="countdown" label="倒计时" width="100" sortable></el-table-column>
+      <el-table-column prop="name" label="模具名称" width="100" sortable></el-table-column>
+      <el-table-column prop="mouldNumber" label="模具编号" width="120" sortable></el-table-column>
+      <el-table-column prop="assets" label="资产方" width="120" sortable></el-table-column>
+      <el-table-column prop="state" label="模具状态" width="100" sortable></el-table-column>
+      <el-table-column label="操作" width="160" sortable>
+        <el-button size="small">修改</el-button>
+        <el-button type="danger" size="small">删除</el-button>
+      </el-table-column>
+    </el-table>
+
+    <!--工具条-->
+    <el-col :span="24" class="toolbar">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[20 , 50 , 80 , 100 , 200]"
+        :page-size="20"
+        layout="total, sizes, prev, pager, next"
+        :total="total"
+        style="float:right;"
+      ></el-pagination>
+    </el-col>
+
+    <!--新增界面-->
+    <el-dialog
+      title="新建模具"
+      v-if="addFormVisible"
+      :visible.sync="addFormVisible"
+      :close-on-click-modal="false"
+      customClass="customWidth"
+    >
+      <el-form
+        :model="newAllocation"
+        label-width="100px"
+        :rules="formRules"
+        ref="newAllocation"
+        :inline="true"
+        class="demo-form-inline"
+      >
+        <el-form-item label="设备号" prop="typeNumber">
+          <el-input v-model="newAllocation.deviceNumber" autocomplete="off" placeholder="请填写"></el-input>
+        </el-form-item>
+        <el-form-item label="所属公司" prop="name">
+          <el-input v-model="newAllocation.company" autocomplete="off" placeholder="请填写"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click.native="addFormVisible = false">取消</el-button>
+        <!-- 这里少了几个属性别忘了加上了 -->
+        <el-button type="primary">提交</el-button>
+      </div>
+    </el-dialog>
+  </section>
+</template>
+
+<script>
+import util from "../../common/js/util";
+export default {
+  data() {
+    return {
+      allocations: [
+        //临时数据
+        {
+          deviceNumber: "0123456",
+          power: "50%",
+          countdown: "400天",
+          name: "墨盒",
+          mouldNumber: "MUJU123456",
+          assets: "南京火石闪信",
+          state: "1"
+        },
+        {
+          deviceNumber: "7891011",
+          power: "20%",
+          countdown: "100天",
+          name: "墨盒2",
+          mouldNumber: "MUJU654321",
+          assets: "南京火石闪信",
+          state: "0"
+        }
+      ],
+      newAllocation: {
+        deviceNumber: "",
+        company: ""
+      },
+      filters: {
+        name: "",
+        value: ""
+      },
+      formRules: {},
+      listLoading: false,
+      total: 0,
+      tableHeight: 0,
+      addFormVisible: false
+    };
+  },
+  methods: {
+    //分页
+    handleCurrentChange(val) {
+      this.page = val;
+      // this.getMoulds();
+    },
+    handleSizeChange(val) {
+      this.size = val;
+      // this.getMoulds();
+    },
+    //添加界面
+    showAllocation() {
+      this.addFormVisible = true;
+      this.newAllocation = {
+        deviceNumber: "",
+        company: ""
+      };
+    }
+  },
+  created() {
+    let height = window.innerHeight;
+    this.tableHeight = height - 210;
+  },
+  mounted() {}
+};
+</script>
+
+<style scoped>
+</style>

ys_vue/src/views/detection/detection.vue

@@ -5,14 +5,14 @@
       <el-form :inline="true" :model="filters">
         <el-col :span="2">
           <el-form-item>
-            <el-select v-model="filters.value" clearable placeholder="请选择">
+            <el-select v-model="filters.value" placeholder="请选择">
               <el-option label="编号" value="0"></el-option>
               <el-option label="名称" value="1"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-form-item>
-          <el-input v-model="filters.name" placeholder="请输入编号或名称进行搜索"></el-input>
+          <el-input v-model="filters.name" placeholder="请输入关键字进行搜索"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary">查询</el-button>
@@ -100,7 +100,7 @@ export default {
       ],
       filters: {
         name: "",
-        value: ""
+        value: "0"
       },
       listLoading: false,
       total: 0,
@@ -108,27 +108,58 @@ export default {
     };
   },
   methods: {
-    //  分页
+    //分页
     handleCurrentChange(val) {
       this.page = val;
-      // this.getUsers();
+      // this.getMoulds();
     },
     handleSizeChange(val) {
       this.size = val;
-      // this.getUsers();
-    },
-    selsChange: function(sels) {
-      this.sels = sels;
+      // this.getMoulds();
     },
     toMaintenance(id) {
       this.$router.push("/detection/" + id);
+    },
+    getMoulds() {
+      // this.listLoading = true;
+      // this.http.post(
+      //   this.port.project.userList,
+      //   {
+      //     keyName: this.filters.keyName,
+      //     currentPage: this.page,
+      //     pageSize: this.size,
+      //     companyId: this.filters.companyId == "" ? -1 : this.filters.companyId,
+      //     flag: this.filters.flag == "姓名" ? 0 : this.filters.flag
+      //   },
+      //   res => {
+      //     this.listLoading = false;
+      //     if (res.code == "ok") {
+      //       this.list = res.data.list;
+      //       this.total = res.data.total;
+      //     } else {
+      //       this.$message({
+      //         message: res.msg,
+      //         type: "error"
+      //       });
+      //     }
+      //   },
+      //   error => {
+      //     this.listLoading = false;
+      //     this.$message({
+      //       message: error,
+      //       type: "error"
+      //     });
+      //   }
+      // );
     }
   },
   created() {
     let height = window.innerHeight;
     this.tableHeight = height - 210;
   },
-  mounted() {}
+  mounted() {
+    // this.getMoulds();
+  }
 };
 </script>
 

ys_vue/src/views/mold/moldList.vue

@@ -18,7 +18,7 @@
           <el-button type="primary">查询</el-button>
         </el-form-item>
         <el-form-item style="float: right">
-          <el-button type="primary">新建</el-button>
+          <el-button type="primary" @click="showAdd">新建</el-button>
         </el-form-item>
       </el-form>
     </el-col>
@@ -86,6 +86,69 @@
         style="float:right;"
       ></el-pagination>
     </el-col>
+
+    <!--新增界面-->
+    <el-dialog
+      title="新建模具"
+      v-if="addFormVisible"
+      :visible.sync="addFormVisible"
+      :close-on-click-modal="false"
+      customClass="customWidth"
+    >
+      <el-form
+        :model="newMould"
+        label-width="100px"
+        :rules="formRules"
+        ref="newMould"
+        :inline="true"
+        class="demo-form-inline"
+      >
+        <el-form-item label="模具类型编号" prop="typeNumber">
+          <el-input v-model="newMould.typeNumber" autocomplete="off" placeholder="请输入模具类型编号"></el-input>
+        </el-form-item>
+        <el-form-item label="模具名称" prop="name">
+          <el-input v-model="newMould.name" autocomplete="off" placeholder="请输入模具名称"></el-input>
+        </el-form-item>
+        <el-form-item label="所属项目" prop="project">
+          <el-input v-model="newMould.project" autocomplete="off" placeholder="请输入所属项目"></el-input>
+        </el-form-item>
+        <el-form-item label="所属客户" prop="client">
+          <el-input v-model="newMould.client" autocomplete="off" placeholder="请输入所属客户"></el-input>
+        </el-form-item>
+        <el-form-item label="生产厂家" prop="manufacturer">
+          <el-input v-model="newMould.manufacturer" autocomplete="off" placeholder="请输入生产厂家"></el-input>
+        </el-form-item>
+        <el-form-item label="云模盒编号" prop="mouldNumber">
+          <el-input v-model="newMould.mouldNumber" autocomplete="off" placeholder="请输入云模盒编号"></el-input>
+        </el-form-item>
+        <el-form-item label="模次寿命" prop="lifetime">
+          <el-input v-model="newMould.lifetime" autocomplete="off" placeholder="请输入模次寿命"></el-input>
+        </el-form-item>
+        <el-form-item label="初始模次" prop="initial">
+          <el-input v-model="newMould.initial" autocomplete="off" placeholder="请输入初始模次"></el-input>
+        </el-form-item>
+        <el-form-item label="对应RFID码" prop="RFIDcode">
+          <el-input v-model="newMould.RFIDcode" autocomplete="off" placeholder="请输入对应RFID码"></el-input>
+        </el-form-item>
+        <el-form-item label="需要图纸资料" prop="RFIDcode">
+          <el-checkbox v-model="newMould.blueprint"></el-checkbox>
+        </el-form-item>
+        <el-form-item label="需要Bom表" prop="RFIDcode">
+          <el-checkbox v-model="newMould.BOMtable"></el-checkbox>
+        </el-form-item>
+        <el-form-item label="需要零件清单" prop="RFIDcode">
+          <el-checkbox v-model="newMould.partList"></el-checkbox>
+        </el-form-item>
+        <el-form-item label="需要保养标准" prop="RFIDcode">
+          <el-checkbox v-model="newMould.standard"></el-checkbox>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click.native="addFormVisible = false">取消</el-button>
+        <!-- 这里少了几个属性别忘了加上了 -->
+        <el-button type="primary">提交</el-button>
+      </div>
+    </el-dialog>
   </section>
 </template>
 
@@ -127,17 +190,34 @@ export default {
           standard: true
         }
       ],
+      newMould: {
+        typeNumber: "",
+        name: "",
+        project: "",
+        client: "",
+        manufacturer: "",
+        mouldNumber: "",
+        lifetime: "",
+        initial: "",
+        RFIDcode: "",
+        blueprint: false,
+        BOMtable: false,
+        partList: false,
+        standard: false
+      },
       filters: {
         name: "",
         value: ""
       },
+      formRules: {},
       listLoading: false,
       total: 0,
-      tableHeight: 0
+      tableHeight: 0,
+      addFormVisible: false
     };
   },
   methods: {
-    //  分页
+    //分页
     handleCurrentChange(val) {
       this.page = val;
       // this.getUsers();
@@ -151,6 +231,25 @@ export default {
     },
     toDetail(id) {
       this.$router.push("/moldDetail/" + id);
+    },
+    //添加界面
+    showAdd() {
+      this.addFormVisible = true;
+      this.newMould = {
+        typeNumber: "",
+        name: "",
+        project: "",
+        client: "",
+        manufacturer: "",
+        mouldNumber: "",
+        lifetime: "",
+        initial: "",
+        RFIDcode: "",
+        blueprint: false,
+        BOMtable: false,
+        partList: false,
+        standard: false
+      };
     }
   },
   created() {