路由修改

target/classes/main/resources/mapper/MouldMapper.xml

@@ -32,5 +32,7 @@
     <sql id="Base_Column_List">
         id, model_no, model_name, water_gap, tonnage, oc_cycle, daily_output, company_id, current_version_id, state, is_delete, creator_id, project_id, rfid, setting_life, area, factory_id, factory_name, initial_modulus, equipment_id, belong_project_grade, produce_company_id
     </sql>
-
+    <update id="updateMouldByProjectId">
+        update tb_mould set project_id = null where project_id = #{project.id}
+    </update>
 </mapper>

ys_vue/src/port.js

@@ -14,8 +14,12 @@ export default {
         projectList: '/project/list', //项目列表
         addProject: '/project/add', //添加或修改项目
 
-        getUserList: '/project/getUserList', //获取人员列表
-        getUserById: '/project/getUserListByCompanyIds', // 根据公司id获取人员
+        getUserList: '/user/getUserList', //获取用户列表
+        getUserById: '/user/getUserListByCompanyIds', // 给项目分配参与人的时候根据公司id获取公司下的人员
+    },
+    mold: {
+        addMold: '/mould/addOrUpdate', //添加/修改模具设备
+        modelList: '/mould/modelList', //给项目分配模具获取该公司下的模具列表
     },
     // 基础管理
     base: {
@@ -27,13 +31,16 @@ export default {
         addCompany: '/company/add',  //（公司）
         companyList: '/company/list', 
         delCompany: '/company/delete', 
-        companys: '/user/getCompanyList', //获取公司列表
+        companys: '/company/getCompanyList', //创建账号是所获取的公司列表
+        comps: '/company/getCompanys', //创建模具获取的(资产方)公司列表
 
         addFactory: '/factory/add',  //（工厂）
         factoryList: '/factory/list', 
         delFactory: '/factory/delete',
 
-        editMould: '/mouldequipment/addOrUpdate', //添加或修改模具
-        enableMould: '/mouldequipment/use', //使用模具
+        editMould: '/mouldequipment/addOrUpdate', //添加/修改模具设备
+        mouldeList: '/mouldequipment/getEquipmentList', //设备列表
+        enableMould: '/mouldequipment/use', //启用设备
+        moulds: '/mouldequipment/getMouldEquipmentList', //创建模具时获取资产方公司的设备列表
     }
 }

ys_vue/src/views/base/comp.vue

@@ -53,7 +53,7 @@
 					<el-input v-model="addForm.companyName" autocomplete="off" placeholder="请输入公司地址"></el-input>
 				</el-form-item>
                 <el-form-item label="公司类型" prop="companyType">
-                    <el-select v-model="addForm.companyType" clearable filterable placeholder="请选择公司类型" style="width:532px">
+                    <el-select v-model="addForm.companyType" clearable filterable placeholder="请选择公司类型" style="width:533px">
                         <el-option v-for="item in team" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
@@ -75,7 +75,7 @@
 					<el-input v-model="editForm.companyName" autocomplete="off" placeholder="请输入公司地址"></el-input>
 				</el-form-item>
                 <el-form-item label="公司名称" prop="companyType">
-                    <el-select v-model="editForm.companyType" clearable filterable placeholder="请选择公司类型" style="width:532px">
+                    <el-select v-model="editForm.companyType" clearable filterable placeholder="请选择公司类型" style="width:533px">
                         <el-option v-for="item in team" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
@@ -112,6 +112,9 @@
 					companyName: [
 						{ required: true, message: '请输入公司名称', trigger: 'blur' }
                     ],
+                    companyType: [
+                        { required: true, message:'请选择公司类型', trigger: ['blur', 'change'] }
+                    ],
                     companyAddress: [
                         { required: true, message: '请输入公司地址', trigger: 'blur' }
                     ]

ys_vue/src/views/mold/moldList.vue

@@ -2,25 +2,25 @@
   <section>
     <!--工具条-->
     <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-      <el-form :inline="true" :model="filters">
-        <el-col :span="2">
-          <el-form-item>
-            <el-select v-model="filters.value" clearable 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="showAdd">新建</el-button>
-        </el-form-item>
-      </el-form>
+        <el-form :inline="true" :model="filters">
+            <el-col :span="2">
+                <el-form-item>
+                    <el-select v-model="filters.value" clearable 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" v-if="user.parentId == 1">
+                <el-button type="primary" @click="showAdd">新建</el-button>
+            </el-form-item>
+        </el-form>
     </el-col>
 
     <!--列表-->
@@ -35,7 +35,7 @@
       <el-table-column prop="typeNumber" label="模具类型编号" width="130" sortable></el-table-column>
       <el-table-column prop="name" label="模具名称" width="100" sortable></el-table-column>
       <el-table-column prop="project" label="所属项目" width="100" sortable></el-table-column>
-      <el-table-column prop="client" label="所属客户" width="100" sortable></el-table-column>
+      <el-table-column prop="client" label="所属客户" sortable></el-table-column>
       <el-table-column prop="manufacturer" label="生产厂家" width="100" sortable></el-table-column>
       <el-table-column prop="mouldNumber" label="云模盒编号" width="120" sortable></el-table-column>
       <el-table-column prop="lifetime" label="模次寿命" width="100" sortable></el-table-column>
@@ -88,176 +88,140 @@
     </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 title="新建模具" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth">
+        <el-form :model="addForm" label-width="100px" :rules="formRules" ref="addForm">
+            <el-form-item label="模具编号" prop="modelNo">
+                <el-input v-model="addForm.modelNo" autocomplete="off" placeholder="请输入模具编号"></el-input>
+            </el-form-item>
+            <el-form-item label="模具名称" prop="modelName">
+                <el-input v-model="addForm.modelName" autocomplete="off" placeholder="请输入模具名称"></el-input>
+            </el-form-item>
+            <el-form-item label="云模盒编号" prop="mouldNumber">
+                <el-select v-model="addForm.companyType" clearable filterable placeholder="请选择公司类型" style="width:533px">
+                    <el-option v-for="item in team" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                </el-select>
+                <el-input v-model="addForm.mouldNumber" 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" @click.native="addSubmit" :loading="addLoading">提交</el-button>
+        </div>
     </el-dialog>
   </section>
 </template>
 
 <script>
-import util from "../../common/js/util";
-export default {
-  data() {
-    return {
-      moulds: [
-        //临时数据
-        {
-          typeNumber: "MUJU002",
-          name: "墨模具测试",
-          project: "墨盒项目",
-          client: "南京海市蜃楼有限公司",
-          manufacturer: "南京江宁制造局",
-          mouldNumber: "MOHE0023",
-          lifetime: "1年",
-          initial: "36",
-          RFIDcode: "RFID1234",
-          blueprint: true,
-          BOMtable: true,
-          partList: false,
-          standard: false
+    import util from "../../common/js/util";
+    export default {
+        data() {
+            return {
+                user: JSON.parse(sessionStorage.getItem('user')),
+                moulds: [
+                    //临时数据
+                    {
+                    typeNumber: "MUJU002",
+                    name: "墨模具测试",
+                    project: "墨盒项目",
+                    client: "南京海市蜃楼有限公司",
+                    manufacturer: "南京江宁制造局",
+                    mouldNumber: "MOHE0023",
+                    lifetime: "1年",
+                    initial: "36",
+                    RFIDcode: "RFID1234",
+                    blueprint: true,
+                    BOMtable: true,
+                    partList: false,
+                    standard: false
+                    },
+                    {
+                    typeNumber: "MUJU003",
+                    name: "啦啦啦测试",
+                    project: "啦啦项目",
+                    client: "南京啦啦啦有限公司",
+                    manufacturer: "南京啦啦制造局",
+                    mouldNumber: "MOHE0045",
+                    lifetime: "1秒",
+                    initial: "47",
+                    RFIDcode: "RFID5678",
+                    blueprint: false,
+                    BOMtable: false,
+                    partList: true,
+                    standard: true
+                    }
+                ],
+                filters: {
+                    name: "",
+                    value: ""
+                },
+                
+                formRules: {
+                    modelNo: [
+                        { required: true, message: '请输入模具编号', trigger: 'blur' }
+                    ],
+                    modelName: [
+                        { required: true, message: '请输入模具名称', trigger: 'blur' }
+                    ],
+                    managerId: [
+                        { required: true, message: '请选择云模盒编号', trigger: ['blur','change'] }
+                    ]
+                },
+                listLoading: false,
+                total: 0,
+                tableHeight: 0,
+                addFormVisible: false,
+                addForm: {
+                    modelNo: "",
+                    modelName: "",
+                    managerId: ""       
+                }
+            };
+        },
+        methods: {
+            //分页
+            handleCurrentChange(val) {
+                this.page = val;
+                // this.getUsers();
+            },
+            handleSizeChange(val) {
+                this.size = val;
+                // this.getUsers();
+            },
+            selsChange: function(sels) {
+                this.sels = sels;
+            },
+            toDetail(id) {
+                this.$router.push("/moldDetail/" + id);
+            },
+            //添加界面
+            showAdd() {
+                this.addFormVisible = true;
+                this.addForm = {
+                    typeNumber: "",
+                    name: "",
+                    project: "",
+                    client: "",
+                    manufacturer: "",
+                    mouldNumber: "",
+                    lifetime: "",
+                    initial: "",
+                    RFIDcode: "",
+                    blueprint: false,
+                    BOMtable: false,
+                    partList: false,
+                    standard: false
+                };
+            }
         },
-        {
-          typeNumber: "MUJU003",
-          name: "啦啦啦测试",
-          project: "啦啦项目",
-          client: "南京啦啦啦有限公司",
-          manufacturer: "南京啦啦制造局",
-          mouldNumber: "MOHE0045",
-          lifetime: "1秒",
-          initial: "47",
-          RFIDcode: "RFID5678",
-          blueprint: false,
-          BOMtable: false,
-          partList: true,
-          standard: true
+        created() {
+            let height = window.innerHeight;
+            this.tableHeight = height - 210;
+        },
+        mounted() {
+
         }
-      ],
-      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,
-      addFormVisible: false
     };
-  },
-  methods: {
-    //分页
-    handleCurrentChange(val) {
-      this.page = val;
-      // this.getUsers();
-    },
-    handleSizeChange(val) {
-      this.size = val;
-      // this.getUsers();
-    },
-    selsChange: function(sels) {
-      this.sels = sels;
-    },
-    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() {
-    let height = window.innerHeight;
-    this.tableHeight = height - 210;
-  },
-  mounted() {}
-};
 </script>
 
 <style scoped>