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

target/classes/main/resources/application.properties

@@ -0,0 +1,43 @@
+# ####################################################################################################
+# 服务端配置
+server.port=8099
+server.servlet.context-path=/
+server.tomcat.uri-encoding=UTF-8
+# ####################################################################################################
+# thymeleaf 配置
+spring.thymeleaf.cache=false
+spring.thymeleaf.jackson.time-zone=GMT+8
+spring.thymeleaf.jackson.date-format=yyyy-MM-dd HH:mm:ss
+# ####################################################################################################
+# 数据源配置
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.username=root
+spring.datasource.password=p011430seya10
+#spring.datasource.druid.test-on-borrow=true
+#spring.datasource.druid.test-while-idle=true
+# ####################################################################################################
+# MyBatis 配置
+mybatis.mapper-locations=mappers/*Mapper.xml
+mybatis.type-aliases-package=com.hssx.cloudmodel.entity/*
+# 控制台输出SQL语句
+logging.level.com.hssx.cloudmodel.mapper = debug
+# ####################################################################################################
+#配置Session
+spring.session.store-type=none
+# ####################################################################################################
+#成功页面跳转
+spring.thymeleaf.prefix=classpath:/static/
+######################################################################################################
+## redis 配置
+#spring.redis.host=localhost
+#spring.redis.port=6379
+######################################################################################################
+# 文件上传路径
+upload.path=D:/cloud/upload/
+#######################################################################################################
+# 配置上传文件的大小设置
+# Single file max size  即单个文件大小
+spring.servlet.multipart.max-file-size=10MB
+spring.servlet.multipart.max-request-size=100MB
+

target/classes/main/resources/application.yml

@@ -0,0 +1,30 @@
+
+##########
+logging:
+  level:
+    root: info
+    org.mybatis: debug
+    java.sql: debug
+    org.springframework.web: trace
+    #打印sql语句
+    com.example.plus.mapper: debug
+##########
+mybatis-plus:
+#  mapper-locations: classpath:mapper/*/*.xml
+#  #实体扫描，多个package用逗号或者分号分隔
+#  typeAliasesPackage: com.hssx.cloudmodel
+  global-config:
+    #主键类型  0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID";
+    id-type: 0
+    #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断"
+    field-strategy: 2
+    db-column-underline: true
+    refresh-mapper:
+#################插入和更新非null判断
+    db-config:
+      insert-strategy: not_null
+      update-strategy: not_null
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+

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

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.CompanyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.Company">
+        <id column="id" property="id" />
+        <result column="company_name" property="companyName" />
+        <result column="company_address" property="companyAddress" />
+        <result column="company_type" property="companyType" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, company_name, company_address, company_type
+    </sql>
+
+    <select id="getListByKeyName" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from
+        tb_company
+        <where>
+            <if test="keyName != null and keyName != ''">
+                company_name like concat('%',#{keyName},'%')
+            </if>
+        </where>
+        Limit #{start},#{pageSize}
+    </select>
+
+</mapper>

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.CustomCompanyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.CustomCompany">
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
+        <result column="company_name" property="companyName" />
+        <result column="project_id" property="projectId" />
+        <result column="indate" property="indate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, company_id, company_name, project_id, indate
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.DictionaryDataMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.DictionaryData">
+        <id column="id" property="id" />
+        <result column="dict_code" property="dictCode" />
+        <result column="data_name" property="dataName" />
+        <result column="dict_value" property="dictValue" />
+        <result column="dict_order" property="dictOrder" />
+        <result column="disabled" property="disabled" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, dict_code, data_name, dict_value, dict_order, disabled
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.FactoryMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.Factory">
+        <id column="id" property="id" />
+        <result column="factory_name" property="factoryName" />
+        <result column="factory_area" property="factoryArea" />
+        <result column="y_lng" property="yLng" />
+        <result column="x_lat" property="xLat" />
+        <result column="indate" property="indate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, factory_name, factory_area, y_lng, x_lat, indate
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.MouldEquipmentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.MouldEquipment">
+        <id column="id" property="id" />
+        <result column="equipment_name" property="equipmentName" />
+        <result column="start_time" property="startTime" />
+        <result column="end_time" property="endTime" />
+        <result column="use_life" property="useLife" />
+        <result column="belong_company_id" property="belongCompanyId" />
+        <result column="equipment_no" property="equipmentNo" />
+        <result column="is_use" property="isUse" />
+        <result column="hill_number" property="hillNumber" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, is_use, hill_number
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.MouldMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.Mould">
+        <id column="id" property="id" />
+        <result column="model_no" property="modelNo" />
+        <result column="model_name" property="modelName" />
+        <result column="water_gap" property="waterGap" />
+        <result column="tonnage" property="tonnage" />
+        <result column="oc_cycle" property="ocCycle" />
+        <result column="daily_output" property="dailyOutput" />
+        <result column="company_id" property="companyId" />
+        <result column="current_version_id" property="currentVersionId" />
+        <result column="state" property="state" />
+        <result column="is_delete" property="isDelete" />
+        <result column="creator_id" property="creatorId" />
+        <result column="project_id" property="projectId" />
+        <result column="rfid" property="rfid" />
+        <result column="setting_life" property="settingLife" />
+        <result column="area" property="area" />
+        <result column="factory_id" property="factoryId" />
+        <result column="factory_name" property="factoryName" />
+        <result column="initial_modulus" property="initialModulus" />
+        <result column="equipment_id" property="equipmentId" />
+        <result column="belong_project_grade" property="belongProjectGrade" />
+        <result column="produce_company_id" property="produceCompanyId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <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>

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.ProjectFileMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.ProjectFile">
+        <id column="id" property="id" />
+        <result column="project_id" property="projectId" />
+        <result column="uploader_id" property="uploaderId" />
+        <result column="uploader" property="uploader" />
+        <result column="file_name" property="fileName" />
+        <result column="url" property="url" />
+        <result column="file_type" property="fileType" />
+        <result column="file_size" property="fileSize" />
+        <result column="indate" property="indate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, project_id, uploader_id, uploader, file_name, url, file_type, file_size, indate
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.ProjectMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.Project">
+        <id column="id" property="id" />
+        <result column="project_name" property="projectName" />
+        <result column="project_no" property="projectNo" />
+        <result column="start_time" property="startTime" />
+        <result column="end_time" property="endTime" />
+        <result column="content" property="content" />
+        <result column="creator_id" property="creatorId" />
+        <result column="creator" property="creator" />
+        <result column="is_delete" property="isDelete" />
+        <result column="owner_company" property="ownerCompany" />
+        <result column="owner_company_name" property="ownerCompanyName" />
+        <result column="indate" property="indate" />
+        <result column="manager_id" property="managerId" />
+        <result column="manager" property="manager" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, project_name, project_no, start_time, end_time, content, creator_id, creator, is_delete, owner_company, owner_company_name, indate, manager_id, manager
+    </sql>
+
+    <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.ProjectVO">
+        <id column="id" property="id" />
+        <result column="project_name" property="projectName" />
+        <result column="project_no" property="projectNo" />
+        <result column="creator_id" property="creatorId" />
+        <result column="creator" property="creator" />
+        <result column="is_delete" property="isDelete" />
+        <result column="indate" property="indate" />
+        <result column="manager_id" property="managerId" />
+        <result column="manager" property="manager" />
+        <collection property="models" ofType="com.hssx.cloudmodel.entity.Mould">
+            <id column="id" property="id" />
+            <result column="model_no" property="modelNo" />
+            <result column="model_name" property="modelName" />
+        </collection>
+    </resultMap>
+
+    <select id="getProjectListByUid" resultMap="BaseResultMap">
+        select
+        p.id id,p.project_name project_name, p.creator creator,p.owner_company owner_company,
+        p.owner_company_name owner_company_name,
+        p.indate indate
+        from
+        tb_project p
+        left join tb_project_user pu
+        on p.id = pu.project_id
+        <where>
+            <if test="currentUser.id != 1">
+                pu.user_id = #{currentUser.id}
+            </if>
+            <if test="keyName != null and keyName != ''">
+                p.project_name like concat('%',#{keyName},'%')
+            </if>
+        </where>
+    </select>
+
+    <select id="getProjectById" resultMap="BaseResultMapVO">
+    select
+        p.id id, p.project_name project_name, p.project_no project_no, p.creator_id creator_id, p.creator creator, p.owner_company owner_company,
+        p.owner_company_name owner_company_name,p.indate indate,
+        m.model_no model_no,m.model_name model_name
+    from
+        tb_project p
+    left join tb_mould m
+    on p.id = m.project_id
+    where
+      p.id = #{id}
+    </select>
+
+    <resultMap id="UserResultMap" type="com.hssx.cloudmodel.entity.User">
+        <id column="id" property="id" />
+        <result column="username" property="username" />
+        <result column="role_type" property="roleType" />
+        <result column="company_id" property="companyId" />
+        <result column="head_imgurl" property="headImgurl" />
+        <result column="subordinate_type" property="subordinateType" />
+    </resultMap>
+
+    <select id="getProjectUserById" resultMap="UserResultMap">
+        select
+          u.id id, u.username username, u.indate indate, u.head_imgurl head_imgurl, u.subordinate_type subordinate_type
+        from
+          tb_project_user pu
+        left join
+          tb_user u
+        on
+          pu.user_id = u.id
+        where
+          pu.project_id = #{id}
+    </select>
+
+</mapper>

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.ProjectUserMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.ProjectUser">
+        <id column="id" property="id" />
+        <result column="project_id" property="projectId" />
+        <result column="user_id" property="userId" />
+        <result column="subordinate" property="subordinate" />
+        <result column="role_type" property="roleType" />
+        <result column="subordinate_type" property="subordinateType" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, project_id, user_id, subordinate, role_type, subordinate_type
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.UserCompanyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.UserCompany">
+        <id column="id" property="id" />
+        <result column="user_id" property="userId" />
+        <result column="belong_company_id" property="belongCompanyId" />
+        <result column="cooperation_company_id" property="cooperationCompanyId" />
+        <result column="indate" property="indate" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, user_id, belong_company_id, cooperation_company_id, indate
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hssx.cloudmodel.mapper.UserMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.cloudmodel.entity.User">
+        <id column="id" property="id" />
+        <result column="account" property="account" />
+        <result column="username" property="username" />
+        <result column="password" property="password" />
+        <result column="mobile" property="mobile" />
+        <result column="role_type" property="roleType" />
+        <result column="company_id" property="companyId" />
+        <result column="parent_id" property="parentId" />
+        <result column="sex" property="sex" />
+        <result column="role_name" property="roleName" />
+        <result column="work_state" property="workState" />
+        <result column="is_disable" property="isDisable" />
+        <result column="indate" property="indate" />
+        <result column="head_imgurl" property="headImgurl" />
+        <result column="team_name" property="teamName" />
+        <result column="subordinate_type" property="subordinateType" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, account, username, password, mobile, role_type, company_id, parent_id, sex, role_name, work_state, is_disable, indate, head_imgurl, team_name, subordinate_type
+    </sql>
+
+    <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.UserVO">
+        <id column="id" property="id" />
+        <result column="account" property="account" />
+        <result column="username" property="username" />
+        <result column="password" property="password" />
+        <result column="mobile" property="mobile" />
+        <result column="role_type" property="roleType" />
+        <result column="role_name" property="roleName" />
+        <result column="company_id" property="companyId" />
+        <result column="company_name" property="companyName"/>
+        <result column="parent_id" property="parentId" />
+        <result column="sex" property="sex" />
+        <result column="work_state" property="workState" />
+        <result column="is_disable" property="isDisable" />
+        <result column="indate" property="indate" />
+        <result column="head_imgurl" property="headImgurl" />
+        <result column="team_name" property="teamName" />
+        <result column="subordinate_type" property="subordinateType" />
+    </resultMap>
+
+    <select id="selectListByCondition" resultMap="BaseResultMapVO">
+        SELECT
+        u.id id, u.account account, u.username username, u.password password, u.mobile mobile, u.role_type role_type, u.company_id company_id, c.`company_name` company_name,
+        u.role_name role_name,u.parent_id parent_id, u.sex sex, u.work_state work_state, u.is_disable is_disable,
+        u.indate indate, u.head_imgurl head_imgurl, u.team_name team_name, u.subordinate_type subordinate_type
+        FROM
+        tb_user AS u
+        LEFT JOIN tb_company c
+        ON u.company_id = c.`id`
+        <where>
+            u.id != #{user.id}
+            <if test="user.id != 1">
+                AND u.parent_id = #{user.id}
+            </if>
+            <if test="flag==0 and keyName != '' and keyName !=null">
+                AND u.username like concat('%',#{keyName},'%')
+            </if>
+            <if test="flag==1 and keyName != '' and keyName !=null">
+                AND u.account like concat('%',#{keyName},'%')
+            </if>
+            <if test="companyId != -1">
+                AND  u.company_id = #{companyId}
+            </if>
+        </where>
+        Order by u.id desc
+    </select>
+
+</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>