成果归档跳转；合作单位增加字段

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcArchive.java

@@ -34,14 +34,6 @@ public class CmcArchive extends BaseEntity
     @Excel(name = "备注说明")
     private String submitSituation;
 
-    /** 坐标经度 */
-    @Excel(name = "坐标经度")
-    private String locationLng;
-
-    /** 坐标纬度 */
-    @Excel(name = "坐标纬度")
-    private String locationLat;
-
     /** 生产部门检查员 */
     @Excel(name = "生产部门检查员")
     private Long produceInspector;
@@ -143,24 +135,6 @@ public class CmcArchive extends BaseEntity
     {
         return submitSituation;
     }
-    public void setLocationLng(String locationLng) 
-    {
-        this.locationLng = locationLng;
-    }
-
-    public String getLocationLng() 
-    {
-        return locationLng;
-    }
-    public void setLocationLat(String locationLat) 
-    {
-        this.locationLat = locationLat;
-    }
-
-    public String getLocationLat() 
-    {
-        return locationLat;
-    }
     public void setProduceInspector(Long produceInspector) 
     {
         this.produceInspector = produceInspector;
@@ -323,8 +297,6 @@ public class CmcArchive extends BaseEntity
             .append("projectId", getProjectId())
             .append("submitTime", getSubmitTime())
             .append("submitSituation", getSubmitSituation())
-            .append("locationLng", getLocationLng())
-            .append("locationLat", getLocationLat())
             .append("produceInspector", getProduceInspector())
             .append("qualityInspector", getQualityInspector())
             .append("deptLeader", getDeptLeader())

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcArchiveMapper.xml

@@ -9,8 +9,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectId"    column="project_id"    />
         <result property="submitTime"    column="submit_time"    />
         <result property="submitSituation"    column="submit_situation"    />
-        <result property="locationLng"    column="location_lng"    />
-        <result property="locationLat"    column="location_lat"    />
         <result property="produceInspector"    column="produce_inspector"    />
         <result property="qualityInspector"    column="quality_inspector"    />
         <result property="deptLeader"    column="dept_leader"    />
@@ -51,9 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcArchiveVo">
-        select a.archive_id, a.project_id, a.submit_time, a.submit_situation, a.location_lng, a.location_lat, a.produce_inspector, u.nick_name as produce_nick_name, a.quality_inspector,
-               u1.nick_name as quality_nick_name, a.dept_leader, u2.nick_name as dept_nick_name, a.archiver, u3.nick_name as archive_nick_name, a.receive_time, a.quality_time, a.produce_time,
-               a.dept_time, a.archive_time, a.produce_comment, a.quality_comment, a.dept_comment, a.archive_comment from cmc_archive as a
+        select a.archive_id, a.project_id, a.submit_time, a.submit_situation, a.produce_inspector, u.nick_name as produce_nick_name, a.quality_inspector, u1.nick_name as quality_nick_name,
+               a.dept_leader, u2.nick_name as dept_nick_name, a.archiver, u3.nick_name as archive_nick_name, a.receive_time, a.quality_time, a.produce_time, a.dept_time, a.archive_time,
+               a.produce_comment, a.quality_comment, a.dept_comment, a.archive_comment from cmc_archive as a
         left join sys_user as u on u.user_id = a.produce_inspector
         left join sys_user as u1 on u1.user_id = a.quality_inspector
         left join sys_user as u2 on u2.user_id = a.dept_leader
@@ -66,8 +64,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null  and projectId != ''"> and a.project_id = #{projectId}</if>
             <if test="submitTime != null "> and a.submit_time = #{submitTime}</if>
             <if test="submitSituation != null  and submitSituation != ''"> and a.submit_situation = #{submitSituation}</if>
-            <if test="locationLng != null  and locationLng != ''"> and a.location_lng = #{locationLng}</if>
-            <if test="locationLat != null  and locationLat != ''"> and a.location_lat = #{locationLat}</if>
             <if test="produceInspector != null "> and a.produce_inspector = #{produceInspector}</if>
             <if test="qualityInspector != null "> and a.quality_inspector = #{qualityInspector}</if>
             <if test="deptLeader != null "> and a.dept_leader = #{deptLeader}</if>
@@ -96,8 +92,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null">project_id,</if>
             <if test="submitTime != null">submit_time,</if>
             <if test="submitSituation != null">submit_situation,</if>
-            <if test="locationLng != null">location_lng,</if>
-            <if test="locationLat != null">location_lat,</if>
             <if test="produceInspector != null">produce_inspector,</if>
             <if test="qualityInspector != null">quality_inspector,</if>
             <if test="deptLeader != null">dept_leader,</if>
@@ -117,8 +111,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null">#{projectId},</if>
             <if test="submitTime != null">#{submitTime},</if>
             <if test="submitSituation != null">#{submitSituation},</if>
-            <if test="locationLng != null">#{locationLng},</if>
-            <if test="locationLat != null">#{locationLat},</if>
             <if test="produceInspector != null">#{produceInspector},</if>
             <if test="qualityInspector != null">#{qualityInspector},</if>
             <if test="deptLeader != null">#{deptLeader},</if>
@@ -141,8 +133,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="submitTime != null">submit_time = #{submitTime},</if>
             <if test="submitSituation != null">submit_situation = #{submitSituation},</if>
-            <if test="locationLng != null">location_lng = #{locationLng},</if>
-            <if test="locationLat != null">location_lat = #{locationLat},</if>
             <if test="produceInspector != null">produce_inspector = #{produceInspector},</if>
             <if test="qualityInspector != null">quality_inspector = #{qualityInspector},</if>
             <if test="deptLeader != null">dept_leader = #{deptLeader},</if>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -95,6 +95,7 @@
             <if test="entryTime != null "> and p.entry_time = #{entryTime}</if>
             <if test="exitTime != null "> and p.exit_time = #{exitTime}</if>
         </where>
+        order by project_number desc
     </select>
 
     <select id="selectCmcProjectByProjectId" parameterType="String" resultMap="CmcProjectResult">

oa-back/sql/sql.sql

@@ -731,6 +731,7 @@ insert into sys_role_menu values ('5', '1069');
 insert into sys_role_menu values ('5', '1070');
 insert into sys_role_menu values ('5', '1071');
 insert into sys_role_menu values ('5', '1072');
+insert into sys_role_menu values ('6', '12');
 
 -- ----------------------------
 -- 8、角色和部门关联表  角色1-N部门
@@ -7011,6 +7012,14 @@ create table `cmc_partner`  (
   `partner_id` 				char(19)   		not null	 comment '合作单位id',
   `partner_name` 			varchar(50)  	default null comment '单位名称',
   `contact_person` 			varchar(50)  	default null comment '联系人',
+  `telephone` 				varchar(50)  	default null comment '联系电话',
+  `qualification` 			char(1)  		default null comment '资质等级',
+  `in_worker` 				int  			default null comment '内业规模',
+  `out_worker` 				int  			default null comment '外业规模',
+  `equipment` 				varchar(255)  	default null comment '主要技术装备',
+  `strength` 				varchar(255)  	default null comment '擅长业务方向',
+  `fulfill` 				char(1)  		default null comment '履约能力评价',
+  `remark` 					varchar(255)  	default null comment '备注说明',
   primary key (`partner_id`)
 ) engine = innodb comment = 'cmc合作单位表';
 
@@ -7018,142 +7027,142 @@ create table `cmc_partner`  (
 -- 初始化-合作单位表数据
 -- ----------------------------
 
-insert into `cmc_partner` values ('1', '成都北斗天地科技有限公司', null);
-insert into `cmc_partner` values ('2', '四川省南方测绘公司', '王建');
-insert into `cmc_partner` values ('3', '四川星辰测绘仪器有限公司', null);
-insert into `cmc_partner` values ('4', '成都引泰丰元科技有限公司', null);
-insert into `cmc_partner` values ('5', '四川蜀地勘测规划服务有限公司', '孙亚东');
-insert into `cmc_partner` values ('6', '四川皓土测绘有限公司', '钟一兵');
-insert into `cmc_partner` values ('7', '成都华兴拓图空间信息科技有限公司', null);
-insert into `cmc_partner` values ('8', '成都六合四游遥感技术有限公司', '赵静');
-insert into `cmc_partner` values ('9', '四川缘启科技有限公司', '杜凤');
-insert into `cmc_partner` values ('10', '长江空间信息技术工程有限公司（武汉）', null);
-insert into `cmc_partner` values ('11', '四川宇登工程勘测设计有限公司', '沈燕');
-insert into `cmc_partner` values ('12', '北京东方志远科技股份有限公司', '王大伟');
-insert into `cmc_partner` values ('13', '四川精灵轨测绘技术有限公司', '张念');
-insert into `cmc_partner` values ('14', '德阳蜀科地质勘查有限公司', null);
-insert into `cmc_partner` values ('15', '四川世纪运德管道工程服务有限公司', '贾春华');
-insert into `cmc_partner` values ('16', '四川雅州检测有限公司', null);
-insert into `cmc_partner` values ('17', '重庆光大网络技术有限公司', '陈洪');
-insert into `cmc_partner` values ('18', '重庆市万达网际信息有限责任公司', '王羽');
-insert into `cmc_partner` values ('19', '成都永鑫科技有限责任公司', '王薇');
-insert into `cmc_partner` values ('20', '四川瑞图地信科技有限公司', '朱静');
-insert into `cmc_partner` values ('21', '广州航遥信息科技有限公司', null);
-insert into `cmc_partner` values ('22', '四川诚挚远劳务有限公司', null);
-insert into `cmc_partner` values ('23', '四川御风行航空科技有限公司', '舒利 18583968336');
-insert into `cmc_partner` values ('24', '成都北斗华测导航技术有限公司', null);
-insert into `cmc_partner` values ('25', '二十一世纪空间技术应用股份有限公司', '杨卫');
-insert into `cmc_partner` values ('26', '四川鹏誉地信科技有限公司', '吴伟');
-insert into `cmc_partner` values ('27', '自然资源部第三地理信息制图院', '陈绍国 13980859212');
-insert into `cmc_partner` values ('28', '山东欣亚通用航空有限公司', '胡家玲');
-insert into `cmc_partner` values ('29', '四川浩航慧图勘测规划设计有限公司', null);
-insert into `cmc_partner` values ('30', '成都中地时空科技有限公司', '胥执刚 15828697142');
-insert into `cmc_partner` values ('31', '广州南方测绘科技股份有限公司成都分公司', '王茂羽 13980067269');
-insert into `cmc_partner` values ('32', '四川中规华投建设工程有限公司', null);
-insert into `cmc_partner` values ('33', '广州建通测绘地理信息技术股份有限公司', null);
-insert into `cmc_partner` values ('34', '四川中水成勘院工程物探检测有限公司', '王羿磊');
-insert into `cmc_partner` values ('35', '九江地质工程勘察院', null);
-insert into `cmc_partner` values ('36', '四川新欣力测绘地理信息有限公司', null);
-insert into `cmc_partner` values ('37', '四川涪圣工程设计咨询有限公司', '蒲春国');
-insert into `cmc_partner` values ('38', '云南省遥感中心', '刘朝海 15812116818');
-insert into `cmc_partner` values ('39', '成都经纬空间科技有限公司', '尚进');
-insert into `cmc_partner` values ('40', '四川辰吉信息科技有限公司', null);
-insert into `cmc_partner` values ('41', ' 成都林辉测绘服务有限公司  ', null);
-insert into `cmc_partner` values ('42', '宜宾湛益工程勘察设计有限公司', null);
-insert into `cmc_partner` values ('43', '四川智绘地理信息科技有限公司', null);
-insert into `cmc_partner` values ('44', '宜宾文嘉林业科技服务有限公司    ', null);
-insert into `cmc_partner` values ('45', '凉山州恒信测绘有限责任公司', null);
-insert into `cmc_partner` values ('46', '成都林辉测绘服务有限公司', null);
-insert into `cmc_partner` values ('47', ' 成都中程测绘有限公司', null);
-insert into `cmc_partner` values ('48', '成都绘成测绘有限公司', null);
-insert into `cmc_partner` values ('49', '四川天跃智创科技有限公司', null);
-insert into `cmc_partner` values ('50', '四川永鸿测绘有限公司', '夏时顺');
-insert into `cmc_partner` values ('51', '中煤科工集团重庆研究院有限公司', '杨金虎13657678783');
-insert into `cmc_partner` values ('52', '成都中程测绘有限公司', null);
-insert into `cmc_partner` values ('53', '成都英创思科技有限公司', null);
-insert into `cmc_partner` values ('54', ' 四川皓土测绘有限公司 ', null);
-insert into `cmc_partner` values ('55', '四川蓝盾科技有限公司', null);
-insert into `cmc_partner` values ('56', '四川众茂测绘有限公司 ', null);
-insert into `cmc_partner` values ('57', '四川慧源鹏程工程设计有限公司', null);
-insert into `cmc_partner` values ('58', '深圳市邦茨空间设计有限公司 ', null);
-insert into `cmc_partner` values ('59', '四川汉盛源科技有限公司', null);
-insert into `cmc_partner` values ('60', '中水德方（成都）工程勘察设计有限公司', '黄梅琳');
-insert into `cmc_partner` values ('61', '四川天辰空间信息技术有限公司', null);
-insert into `cmc_partner` values ('62', '四川大圣智云科技有限公司', null);
-insert into `cmc_partner` values ('63', '中水成勘院（云南）建设发展有限公司', null);
-insert into `cmc_partner` values ('64', '四川蜀都善匠科技有限公司', null);
-insert into `cmc_partner` values ('65', ' 四川世纪运德管道工程服务有限公司 ', null);
-insert into `cmc_partner` values ('66', '浙江华东测绘地理信息有限公司', null);
-insert into `cmc_partner` values ('67', '佛山市中诚建筑工程测绘检测有限公司', null);
-insert into `cmc_partner` values ('68', '中国电建集团西北勘测设计研究院有限公司', null);
-insert into `cmc_partner` values ('69', '成都三维云景科技发展有限公司', null);
-insert into `cmc_partner` values ('70', '四川铁拓科技有限公司', null);
-insert into `cmc_partner` values ('71', '四川辰吉信息科技有限公司 ', null);
-insert into `cmc_partner` values ('72', '四川泰恒中勘察设计有限公司', null);
-insert into `cmc_partner` values ('73', '四川长品科技有限公司', null);
-insert into `cmc_partner` values ('74', '四川瓴昕工程管理有限公司 ', null);
-insert into `cmc_partner` values ('75', '佛山市中诚建筑工程测绘检测有限公司 ', null);
-insert into `cmc_partner` values ('76', '四川云地信息技术有限公司  ', null);
-insert into `cmc_partner` values ('77', '北京天目创新科技有限公司 ', null);
-insert into `cmc_partner` values ('78', '四川中正宏图信息技术有限公司 ', null);
-insert into `cmc_partner` values ('79', '四川仪坤测绘有限公司', null);
-insert into `cmc_partner` values ('80', '湖北朝骏测绘有限公司', null);
-insert into `cmc_partner` values ('81', '江西环绕科技服务有限公司', null);
-insert into `cmc_partner` values ('82', '四川皓土测绘有限公司 ', null);
-insert into `cmc_partner` values ('83', '成都市宏锦图文科技有限公司', null);
-insert into `cmc_partner` values ('84', '四川世纪鸿图测绘有限公司 ', null);
-insert into `cmc_partner` values ('85', '四川九凌工程勘察设计有限公司', null);
-insert into `cmc_partner` values ('86', '湖北朝俊测绘有限公司', null);
-insert into `cmc_partner` values ('87', '核工业北京地质研究院', null);
-insert into `cmc_partner` values ('88', '四川泰恒中勘察测绘有限公司', null);
-insert into `cmc_partner` values ('89', '中城航遥（北京）信息工程有限公司  ', null);
-insert into `cmc_partner` values ('90', '成都田冶测绘有限公司', null);
-insert into `cmc_partner` values ('91', '深圳市邦茨空间设计有限公司', null);
-insert into `cmc_partner` values ('92', '成都发启岩土工程勘察设计有限公司', null);
-insert into `cmc_partner` values ('93', '南充市宏扬钻探工程有限公司', null);
-insert into `cmc_partner` values ('94', '四川国高工程项目管理有限公司', null);
-insert into `cmc_partner` values ('95', '四川轩航九域信息技术有限公司', null);
-insert into `cmc_partner` values ('96', '四川兴蜀工程勘察设计集团有限公司', null);
-insert into `cmc_partner` values ('97', '四川磊茂工程技术服务有限公司', null);
-insert into `cmc_partner` values ('98', '上海亚壕科技有限公司', null);
-insert into `cmc_partner` values ('99', '四川省地科环建检测技术有限公司  ', null);
-insert into `cmc_partner` values ('100', '四川浩航慧图勘测规划设计有限公司 ', null);
-insert into `cmc_partner` values ('101', '成都永杰测绘技术服务有限公司', null);
-insert into `cmc_partner` values ('102', '成都木尔科技有限公司', null);
-insert into `cmc_partner` values ('103', '重庆厚耀信息技术服务中心', null);
-insert into `cmc_partner` values ('104', '四川鼎硕测绘有限公司', null);
-insert into `cmc_partner` values ('105', '黄河水利委员会上游水文水资源局', null);
-insert into `cmc_partner` values ('106', '四川瓴昕工程管理有限公司', null);
-insert into `cmc_partner` values ('107', '重庆厚耀信息技术服务中心    ', null);
-insert into `cmc_partner` values ('108', '成都光大测绘咨询有限公司', null);
-insert into `cmc_partner` values ('109', '四川省科源工程技术测试中心有限责任公司 ', null);
-insert into `cmc_partner` values ('110', '松辽众鼎工程设计集团有限公司', null);
-insert into `cmc_partner` values ('111', '自然资源部四川测绘产品质量监督检验站', null);
-insert into `cmc_partner` values ('112', '韶关市荣兴工程测绘有限责任公司', null);
-insert into `cmc_partner` values ('113', '四川启盛信息科技有限公司', null);
-insert into `cmc_partner` values ('114', '四川中科晟图信息技术有限公司', null);
-insert into `cmc_partner` values ('115', '四川成都西米宏成测绘有限公司 ', null);
-insert into `cmc_partner` values ('116', '成都志诚致远科技有限公司 ', null);
-insert into `cmc_partner` values ('117', '北京华遥星宇科技有限公司 ', null);
-insert into `cmc_partner` values ('118', '成都木乘科技有限公司', null);
-insert into `cmc_partner` values ('119', '四川省测绘产品质量监督检验站 、 四川地信测绘计量检测有限公司  ', null);
-insert into `cmc_partner` values ('120', '乌鲁木齐嘉时代测绘服务有限公司', null);
-insert into `cmc_partner` values ('121', '南方（北京）遥感科技有限公司 ', null);
-insert into `cmc_partner` values ('122', '重庆曾爽文化传播有限公司', null);
-insert into `cmc_partner` values ('123', '四川森旺规划设计有限公司', null);
-insert into `cmc_partner` values ('124', '北京航天世景信息技术有限公司', null);
-insert into `cmc_partner` values ('125', '河北晨枫地理信息技术有限公司', null);
-insert into `cmc_partner` values ('126', '四川蜀鸿祥建筑工程有限公司', null);
-insert into `cmc_partner` values ('127', '上海数喆数据科技有限公司', null);
-insert into `cmc_partner` values ('128', '四川众茂测绘有限公司', null);
-insert into `cmc_partner` values ('129', '武汉众诚数维信息技术有限公司', null);
-insert into `cmc_partner` values ('130', ' 四川谦剑测绘有限公司', null);
-insert into `cmc_partner` values ('131', '秀山县云鹏建筑劳务有限公司', null);
-insert into `cmc_partner` values ('132', '成都点云时空科技有限公司', null);
-insert into `cmc_partner` values ('133', '四川浙山建设工程有限公司', null);
-insert into `cmc_partner` values ('134', '四川力兴达工程勘测设计有限公司', null);
-insert into `cmc_partner` values ('135', '中国电建集团中南勘测设计研究院有限公司', null);
-insert into `cmc_partner` values ('136', '成都鑫禾新建筑工程有限公司', null);
+insert into `cmc_partner` values ('1', '成都北斗天地科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('2', '四川省南方测绘公司', '王建', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('3', '四川星辰测绘仪器有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('4', '成都引泰丰元科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('5', '四川蜀地勘测规划服务有限公司', '孙亚东', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('6', '四川皓土测绘有限公司', '钟一兵', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('7', '成都华兴拓图空间信息科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('8', '成都六合四游遥感技术有限公司', '赵静', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('9', '四川缘启科技有限公司', '杜凤', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('10', '长江空间信息技术工程有限公司（武汉）', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('11', '四川宇登工程勘测设计有限公司', '沈燕', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('12', '北京东方志远科技股份有限公司', '王大伟', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('13', '四川精灵轨测绘技术有限公司', '张念', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('14', '德阳蜀科地质勘查有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('15', '四川世纪运德管道工程服务有限公司', '贾春华', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('16', '四川雅州检测有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('17', '重庆光大网络技术有限公司', '陈洪', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('18', '重庆市万达网际信息有限责任公司', '王羽', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('19', '成都永鑫科技有限责任公司', '王薇', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('20', '四川瑞图地信科技有限公司', '朱静', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('21', '广州航遥信息科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('22', '四川诚挚远劳务有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('23', '四川御风行航空科技有限公司', '舒利 18583968336', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('24', '成都北斗华测导航技术有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('25', '二十一世纪空间技术应用股份有限公司', '杨卫', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('26', '四川鹏誉地信科技有限公司', '吴伟', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('27', '自然资源部第三地理信息制图院', '陈绍国 13980859212', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('28', '山东欣亚通用航空有限公司', '胡家玲', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('29', '四川浩航慧图勘测规划设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('30', '成都中地时空科技有限公司', '胥执刚 15828697142', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('31', '广州南方测绘科技股份有限公司成都分公司', '王茂羽 13980067269', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('32', '四川中规华投建设工程有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('33', '广州建通测绘地理信息技术股份有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('34', '四川中水成勘院工程物探检测有限公司', '王羿磊', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('35', '九江地质工程勘察院', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('36', '四川新欣力测绘地理信息有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('37', '四川涪圣工程设计咨询有限公司', '蒲春国', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('38', '云南省遥感中心', '刘朝海 15812116818', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('39', '成都经纬空间科技有限公司', '尚进', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('40', '四川辰吉信息科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('41', ' 成都林辉测绘服务有限公司  ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('42', '宜宾湛益工程勘察设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('43', '四川智绘地理信息科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('44', '宜宾文嘉林业科技服务有限公司    ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('45', '凉山州恒信测绘有限责任公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('46', '成都林辉测绘服务有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('47', ' 成都中程测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('48', '成都绘成测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('49', '四川天跃智创科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('50', '四川永鸿测绘有限公司', '夏时顺', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('51', '中煤科工集团重庆研究院有限公司', '杨金虎13657678783', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('52', '成都中程测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('53', '成都英创思科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('54', ' 四川皓土测绘有限公司 ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('55', '四川蓝盾科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('56', '四川众茂测绘有限公司 ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('57', '四川慧源鹏程工程设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('58', '深圳市邦茨空间设计有限公司 ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('59', '四川汉盛源科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('60', '中水德方（成都）工程勘察设计有限公司', '黄梅琳', null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('61', '四川天辰空间信息技术有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('62', '四川大圣智云科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('63', '中水成勘院（云南）建设发展有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('64', '四川蜀都善匠科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('65', ' 四川世纪运德管道工程服务有限公司 ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('66', '浙江华东测绘地理信息有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('67', '佛山市中诚建筑工程测绘检测有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('68', '中国电建集团西北勘测设计研究院有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('69', '成都三维云景科技发展有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('70', '四川铁拓科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('71', '四川辰吉信息科技有限公司 ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('72', '四川泰恒中勘察设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('73', '四川长品科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('74', '四川瓴昕工程管理有限公司 ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('75', '佛山市中诚建筑工程测绘检测有限公司 ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('76', '四川云地信息技术有限公司  ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('77', '北京天目创新科技有限公司 ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('78', '四川中正宏图信息技术有限公司 ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('79', '四川仪坤测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('80', '湖北朝骏测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('81', '江西环绕科技服务有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('82', '四川皓土测绘有限公司 ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('83', '成都市宏锦图文科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('84', '四川世纪鸿图测绘有限公司 ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('85', '四川九凌工程勘察设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('86', '湖北朝俊测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('87', '核工业北京地质研究院', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('88', '四川泰恒中勘察测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('89', '中城航遥（北京）信息工程有限公司  ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('90', '成都田冶测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('91', '深圳市邦茨空间设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('92', '成都发启岩土工程勘察设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('93', '南充市宏扬钻探工程有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('94', '四川国高工程项目管理有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('95', '四川轩航九域信息技术有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('96', '四川兴蜀工程勘察设计集团有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('97', '四川磊茂工程技术服务有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('98', '上海亚壕科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('99', '四川省地科环建检测技术有限公司  ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('100', '四川浩航慧图勘测规划设计有限公司 ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('101', '成都永杰测绘技术服务有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('102', '成都木尔科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('103', '重庆厚耀信息技术服务中心', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('104', '四川鼎硕测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('105', '黄河水利委员会上游水文水资源局', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('106', '四川瓴昕工程管理有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('107', '重庆厚耀信息技术服务中心    ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('108', '成都光大测绘咨询有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('109', '四川省科源工程技术测试中心有限责任公司 ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('110', '松辽众鼎工程设计集团有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('111', '自然资源部四川测绘产品质量监督检验站', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('112', '韶关市荣兴工程测绘有限责任公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('113', '四川启盛信息科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('114', '四川中科晟图信息技术有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('115', '四川成都西米宏成测绘有限公司 ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('116', '成都志诚致远科技有限公司 ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('117', '北京华遥星宇科技有限公司 ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('118', '成都木乘科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('119', '四川省测绘产品质量监督检验站 、 四川地信测绘计量检测有限公司  ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('120', '乌鲁木齐嘉时代测绘服务有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('121', '南方（北京）遥感科技有限公司 ', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('122', '重庆曾爽文化传播有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('123', '四川森旺规划设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('124', '北京航天世景信息技术有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('125', '河北晨枫地理信息技术有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('126', '四川蜀鸿祥建筑工程有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('127', '上海数喆数据科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('128', '四川众茂测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('129', '武汉众诚数维信息技术有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('130', ' 四川谦剑测绘有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('131', '秀山县云鹏建筑劳务有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('132', '成都点云时空科技有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('133', '四川浙山建设工程有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('134', '四川力兴达工程勘测设计有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('135', '中国电建集团中南勘测设计研究院有限公司', null, null, null, null, null, null, null, null, null);
+insert into `cmc_partner` values ('136', '成都鑫禾新建筑工程有限公司', null, null, null, null, null, null, null, null, null);
 
 -- ----------------------------
 -- 50、cmc品牌项目表
@@ -7224,8 +7233,6 @@ create table `cmc_archive`  (
   `project_id` 				char(19)  		default null comment '项目id',
   `submit_time` 			date			default null comment '成果汇交日期',
   `submit_situation` 		varchar(255)	default null comment '备注说明',
-  `location_lng` 			varchar(10)		default null comment '坐标经度',
-  `location_lat` 			varchar(10)		default null comment '坐标纬度',
   `produce_inspector` 		bigint			default null comment '生产部门检查员',
   `quality_inspector` 		bigint			default null comment '质量检查员',
   `dept_leader` 			bigint			default null comment '技术部负责人',

oa-ui/src/views/flowable/form/access/xmTable.vue

@@ -104,7 +104,7 @@
         </td>
 
         <td rowspan="6">
-          <div>{{ tableForm.remark01 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark01 }}</div>
           <el-input v-if="isStaff" v-model="tableForm.remark01" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
@@ -191,7 +191,7 @@
           </el-radio-group>
         </td>
         <td rowspan="6">
-          <div>{{ tableForm.remark02 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark02 }}</div>
           <el-input v-if="isStaff" v-model="tableForm.remark02" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
@@ -279,7 +279,7 @@
           </el-radio-group>
         </td>
         <td rowspan="3">
-          <div>{{ tableForm.remark03 }}</div>
+          <div v-if="!isStaff">{{ tableForm.remark03 }}</div>
           <el-input v-if="isStaff" v-model="tableForm.remark03" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="3">

oa-ui/src/views/flowable/form/archiveForm.vue

@@ -6,11 +6,12 @@
         <el-divider></el-divider>
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
           <el-form-item label="项目信息" prop="projectId">
-            <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
+            <el-button type="primary" size="mini" @click="openProject = true" v-if="taskName == '成果上传'">选择项目</el-button>
+            <!-- <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
               :disabled="taskName != '成果上传'" clearable>
               <el-option v-for="item in projectList" :key="item.value" :label="item.projectName" :value="item.projectId">
               </el-option>
-            </el-select>
+            </el-select> -->
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="2" direction="vertical">
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
               }}</el-descriptions-item>
@@ -31,7 +32,9 @@
                 '' }}</el-descriptions-item>
               <el-descriptions-item label="质检审核员" label-class-name="my-label">{{
                 chooseProject.qualityInspectorUser ? chooseProject.qualityInspectorUser.nickName : ''
-              }}</el-descriptions-item>
+              }}</el-descriptions-item>              
+              <el-descriptions-item label="坐标经度" label-class-name="my-label">{{ chooseProject.kmlLng }}</el-descriptions-item>              
+              <el-descriptions-item label="坐标纬度" label-class-name="my-label">{{ chooseProject.kmlLat }}</el-descriptions-item>  
             </el-descriptions>
           </el-form-item>
           <el-form-item label="成果提交日期" prop="submitTime">
@@ -39,24 +42,12 @@
               placeholder="请选择成果提交日期" :disabled="taskName != '成果上传'">
             </el-date-picker>
           </el-form-item>
-          <el-row :gutter="20">
-            <el-col :span="12" :xs="24">
-              <el-form-item label="坐标经度" prop="locationLng">
-                <el-input v-model="form.locationLng" placeholder="请输入坐标经度" :disabled="taskName != '成果上传'" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12" :xs="24">
-              <el-form-item label="坐标纬度" prop="locationLat">
-                <el-input v-model="form.locationLat" placeholder="请输入坐标纬度" :disabled="taskName != '成果上传'" />
-              </el-form-item>
-            </el-col>
-          </el-row>
           <el-form-item label="备注说明" prop="submitSituation">
-            <el-input v-model="form.submitSituation" placeholder="请输入备注说明" :disabled="taskName != '成果上传'" />
+            <el-input type="textarea" v-model="form.submitSituation" placeholder="请输入备注说明" :disabled="taskName != '成果上传'" />
           </el-form-item>
           <el-divider></el-divider>
           <el-form-item label="部门检查员检查" prop="produceComment">
-            <el-input v-model="form.produceComment" placeholder="请输入部门检查员检查意见" :disabled="taskName != '部门检查'" />
+            <el-input type="textarea" v-model="form.produceComment" placeholder="请输入部门检查员检查意见" :disabled="taskName != '部门检查'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -77,7 +68,7 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="质量检查员审核" prop="qualityComment">
-            <el-input v-model="form.qualityComment" placeholder="请输入质量检查员审核意见" :disabled="taskName != '质检审核'" />
+            <el-input type="textarea" v-model="form.qualityComment" placeholder="请输入质量检查员审核意见" :disabled="taskName != '质检审核'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -93,7 +84,7 @@
             </el-col>
           </el-row>
           <el-form-item label="技术质量部负责人审核" prop="deptComment">
-            <el-input v-model="form.deptComment" placeholder="请输入技术质量部负责人审核意见" :disabled="taskName != '技术部审核'" />
+            <el-input type="textarea" v-model="form.deptComment" placeholder="请输入技术质量部负责人审核意见" :disabled="taskName != '技术部审核'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -108,8 +99,11 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-form-item label="资料管理">
+          <el-button type="success" size="mini" @click="gotoFile" :disabled="taskName != '成果归档'">前往资料管理系统</el-button>
+        </el-form-item>
           <el-form-item label="技术质量部归档" prop="archiveComment">
-            <el-input v-model="form.archiveComment" placeholder="请输入技术质量部归档意见" :disabled="taskName != '成果归档'" />
+            <el-input type="textarea" v-model="form.archiveComment" placeholder="请输入技术质量部归档意见" :disabled="taskName != '成果归档'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -150,6 +144,9 @@
         <el-button type="primary" @click="taskComplete">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog title="选择项目" :visible.sync="openProject" width="70%" append-to-body>
+      <project-choose @chooseProject="confirmProject"></project-choose>
+    </el-dialog>
   </div>
 </template>
 
@@ -165,10 +162,12 @@ import FlowUser from '@/components/flow/User';
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { getUserByRole } from "@/api/system/role";
+import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
 
 export default {
   components: {
     FlowUser,
+    projectChoose,
     flow
   },
   props: {
@@ -242,6 +241,7 @@ export default {
       },
       chooseProject: {},
       isSelect: false,
+      openProject: false,
       formTotal: 0,
       flowData: {},
       projectList: [],
@@ -532,6 +532,20 @@ export default {
       this.download('oa/archive/export', {
         ...this.queryParams
       }, `archive_${new Date().getTime()}.xlsx`)
+    },
+    confirmProject(val) {
+      if (val.length > 1) {
+        this.$message.error('请选择一个项目');
+        return
+      } else if (val.length == 1) {
+        this.chooseProject = val[0]
+        this.isSelect = true
+        this.form.projectId = val[0].projectId
+      }
+      this.openProject = false
+    },
+    gotoFile(){      
+      this.$router.push({path: '/file'})
     }
   }
 };

oa-ui/src/views/flowable/form/business/brandForm.vue

@@ -5,7 +5,7 @@
         <h2 class="text-center">品牌项目支付审批表</h2>
         <el-divider></el-divider>
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-          <el-form-item label="品牌项目id" prop="projectId">
+          <el-form-item label="品牌项目" prop="projectId">
             <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
               :disabled="taskName != '支付申请'" clearable>
               <el-option v-for="item in projectList" :key="item.value" :label="item.projectName" :value="item.projectId">
@@ -22,25 +22,17 @@
             </el-descriptions>
           </el-form-item>
           <el-form-item label="申请支付说明" prop="applyReason">
-            <el-input v-model="form.applyReason" placeholder="请输入申请支付说明" :disabled="taskName != '支付申请'" />
+            <el-input type="textarea" :rows="2" v-model="form.applyReason" placeholder="请输入申请支付说明"
+              :disabled="taskName != '支付申请'" />
           </el-form-item>
           <el-form-item label="审核文件" prop="approvalDocument">
-            <FileUpload v-if="taskName == '支付申请'" :limit="1" :filePathName="'品牌项目支付/审核文件'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getBrandPath"></FileUpload>
-            <div>
-              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
-                tag="ul">
-                <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
-                  <el-link :href="`${baseUrl}${'/profile/upload' + form.approvalDocument}`" :underline="false"
-                    target="_blank">
-                    <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
-                      {{ getFileName(form.approvalDocument) }}
-                    </span>
-                  </el-link>
-                </li>
-              </transition-group>
+            <FileUpload v-if="form.approvalDocument == '' || form.approvalDocument == null" :disabled="taskName != '支付申请'"
+              :limit="1" :filePathName="'品牌项目支付/审核文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+              @input="getBrandPath"></FileUpload>
+            <div v-if="form.approvalDocument != '' && form.approvalDocument != null">
+              <file-item :document="form.approvalDocument"></file-item>
             </div>
-          </el-form-item>            
+          </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
               <el-form-item label="签名：" label-width="120px">
@@ -423,7 +415,7 @@ export default {
       this.download('oa/brand/export', {
         ...this.queryParams
       }, `brand_${new Date().getTime()}.xlsx`)
-    },    
+    },
     getBrandPath(val) {
       let arr = val.split('/upload')
       this.form.approvalDocument = arr[1]

oa-ui/src/views/flowable/form/business/contractForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-05-15 11:51:21
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-05-29 14:47:07
 -->
 <template>
   <div class="app-container">
@@ -14,8 +14,7 @@
           <el-row :gutter="20">
             <el-col :span="12" :xs="24">
               <el-form-item label="投标项目名称：" prop="tenderId">
-                <el-button type="primary" size="mini" @click="tbOpen = true"
-                  v-if="taskName == '合同拟稿'">选择投标项目</el-button>
+                <el-button type="primary" size="mini" @click="tbOpen = true" v-if="taskName == '合同拟稿'">选择投标项目</el-button>
                 <!-- <el-select v-model="form.tenderId" filterable placeholder="请选择" @change="handleSelectTender"
                   :disabled="taskName != '合同拟稿'" clearable>
                   <el-option v-for="item in tenderList" :key="item.value" :label="item.projectName"
@@ -24,23 +23,22 @@
                 </el-select> -->
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="2" direction="vertical">
                   <el-descriptions-item label="投标项目名称" label-class-name="my-label" :span="2">{{ chooseTender.projectName
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="项目来源" label-class-name="my-label">{{ getProjectSource(chooseTender)
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="招标业主" label-class-name="my-label">{{ chooseTender.partyA
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="联系人" label-class-name="my-label">{{ chooseTender.aPerson
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="联系电话" label-class-name="my-label">{{ chooseTender.aPhone
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
 
               <el-row :gutter="20">
                 <el-col :span="12" :xs="24">
                   <el-form-item label="合同编码" prop="contractCode">
-                    <el-input v-model="form.contractCode" placeholder="请输入合同编码"
-                      :disabled="taskName != '合同拟稿'"></el-input>
+                    <el-input v-model="form.contractCode" placeholder="请输入合同编码" :disabled="taskName != '合同拟稿'"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" :xs="24">
@@ -84,20 +82,11 @@
 
           </el-row>
           <el-form-item label="合同文件" prop="contractDocument">
-            <FileUpload v-if="taskName == '合同拟稿'" ref="contractFile" :limit="1" :filePathName="'承接合同文件'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getContractPath"></FileUpload>
-            <div v-if="taskName != '合同拟稿'">
-              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
-                tag="ul">
-                <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
-                  <el-link :href="`${baseUrl}${'/profile/upload' + form.contractDocument}`" :underline="false"
-                    target="_blank">
-                    <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
-                      {{ getFileName(form.contractDocument) }}
-                    </span>
-                  </el-link>
-                </li>
-              </transition-group>
+            <FileUpload :disabled="taskName != '合同拟稿'" v-if="form.contractDocument == '' || form.contractDocument == null"
+              ref="contractFile" :limit="1" :filePathName="'承接合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+              @input="getContractPath"></FileUpload>
+            <div v-if="form.contractDocument != '' && form.contractDocument != null">
+              <file-item :document="form.contractDocument"></file-item>
             </div>
           </el-form-item>
           <el-divider></el-divider>
@@ -178,8 +167,8 @@
                   <el-input v-model="payment.paymentAmount" clearable :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd"
-                    type="date" placeholder="选择日期" :disabled="taskName != '合同拟稿'">
+                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd" type="date"
+                    placeholder="选择日期" :disabled="taskName != '合同拟稿'">
                   </el-date-picker>
                 </td>
                 <td>
@@ -252,14 +241,14 @@
                     :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)"></el-input>
                 </td>
                 <td style="text-align:left;" @click="clickFile(comment)">
-                  <FileUpload v-if="comment.document == ''" ref="hs" :limit="1" :filePathName="'承接合同文件'"
-                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && !comment.commentUser)"
+                  <FileUpload v-if="comment.document == '' || comment.document == null" ref="hs" :limit="1" :filePathName="'承接合同/线上会审意见'"
+                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)"
                     :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setCommentDocument">
                   </FileUpload>
 
                   <!-- <el-input v-model="comment.document" clearable
                     :disabled="taskName != '线上会审' || (taskName == '线上会审' && !comment.commentUser)"></el-input> -->
-                  <div v-if="comment.document != ''">
+                  <div v-if="comment.document != '' && comment.document != null">
                     <transition-group class="upload-file-list el-upload-list el-upload-list--text"
                       name="el-fade-in-linear" tag="ul">
                       <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
@@ -329,8 +318,13 @@
               <tr>
                 <td>评审意见表</td>
                 <td colspan="5">
-                  <FileUpload v-if="taskName == '会议评审'" ref="contractFile" :limit="1" :filePathName="'承接合同文件'"
-                    :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getMeetingPath"></FileUpload>
+                  <FileUpload :disabled="taskName != '会议评审'"
+                    v-if="meetingForm.document == '' || meetingForm.document == null" ref="meetingDocument" :limit="1"
+                    :filePathName="'承接合同/会议评审意见'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+                    @input="getMeetingPath"></FileUpload>
+                  <div v-if="meetingForm.document != '' && meetingForm.document != null">
+                    <file-item :document="meetingForm.document"></file-item>
+                  </div>
                   <!-- <el-input v-model="meetingForm.document" clearable :disabled="taskName != '会议评审'"></el-input> -->
                 </td>
               </tr>
@@ -372,8 +366,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="签订日期" prop="signDate">
-            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择签订日期" :disabled="taskName != '合同签订'">
+            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期"
+              :disabled="taskName != '合同签订'">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="签订备注" prop="signRemark">
@@ -381,8 +375,9 @@
           </el-form-item>
           <el-form-item label="签订扫描件" prop="signScan">
             <!-- <el-input v-model="form.signScan" placeholder="请输入签订扫描件" :disabled="taskName != '合同签订'" /> -->
-            <FileUpload v-if="form.signScan == null || form.signScan == ''" ref="contractFile" :limit="1"
-              :filePathName="'承接合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getSignScanPath">
+            <FileUpload :disabled="taskName != '合同签订'" v-if="form.signScan == null || form.signScan == ''"
+              ref="contractFile" :limit="1" :filePathName="'承接合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+              @input="getSignScanPath">
             </FileUpload>
             <div v-if="form.signScan != null && form.signScan != ''">
               <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
@@ -443,13 +438,15 @@ import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import ChooseProject from '../components/chooseProject.vue';
 import ChooseTender from '../components/chooseTender.vue';
+import FileItem from './fileItem.vue';
 import { mapGetters } from "vuex";
 export default {
   dicts: ['cmc_scale_grade', 'cmc_unit'],
   components: {
     flow,
     ChooseProject,
-    ChooseTender
+    ChooseTender,
+    FileItem
   },
   props: {
     taskName: {
@@ -1013,8 +1010,8 @@ export default {
         this.form.signScan = ""
       }
     },
-    getMeetingPath(val){
-      
+    getMeetingPath(val) {
+
     },
     getFileName(name) {
       if (name) {
@@ -1023,7 +1020,7 @@ export default {
       }
 
     },
-    confirmProject(val) { 
+    confirmProject(val) {
       this.open = false
       for (let v of val) {
         this.projectContractForm.projectIds.push(v.projectId);

oa-ui/src/views/flowable/form/business/subContract.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: wrh
- * @LastEditTime: 2024-05-20 16:11:08
+ * @LastEditTime: 2024-05-29 14:48:12
 -->
 <template>
   <div class="app-container">
@@ -23,14 +23,14 @@
               <el-descriptions-item label="项目编号" label-class-name="my-label">
                 {{ chooseProject.projectNumber }}</el-descriptions-item>
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">
                 <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
               </el-descriptions-item>
               <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
           <el-row :gutter="20">
@@ -66,8 +66,8 @@
           <el-row :gutter="20">
             <el-col :span="16" :xs="24">
               <el-form-item label="承接单位" prop="partnerId">
-                <el-select allow-create v-model="form.partnerId" filterable placeholder="请选择" :disabled="taskName != '合同拟稿'"
-                  clearable @change="handleSelectPartner">
+                <el-select allow-create v-model="form.partnerId" filterable placeholder="请选择"
+                  :disabled="taskName != '合同拟稿'" clearable @change="handleSelectPartner">
                   <el-option v-for="item in partnerList" :key="item.value" :label="item.partnerName"
                     :value="item.partnerId">
                   </el-option>
@@ -82,20 +82,12 @@
           </el-row>
 
           <el-form-item label="合同文件" prop="contractDocument">
-            <FileUpload v-if="taskName == '合同拟稿'" ref="contractFile" :limit="1" :filePathName="'分包合同文件'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getContractPath"></FileUpload>
-            <div v-if="taskName != '合同拟稿'">
-              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
-                tag="ul">
-                <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
-                  <el-link :href="`${baseUrl}${'/profile/upload' + form.contractDocument}`" :underline="false"
-                    target="_blank">
-                    <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
-                      {{ getFileName(form.contractDocument) }}
-                    </span>
-                  </el-link>
-                </li>
-              </transition-group>
+            <FileUpload v-if="form.contractDocument == '' || form.contractDocument == null" :disabled="taskName != '合同拟稿'"
+              ref="contractFile" :limit="1" :filePathName="'分包合同/合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+              @input="getContractPath">
+            </FileUpload>
+            <div v-if="form.contractDocument != '' && form.contractDocument != null">
+              <file-item :document="form.contractDocument"></file-item>
             </div>
           </el-form-item>
           <el-form-item label="合同计划工作量：">
@@ -175,8 +167,8 @@
                   <el-input v-model="payment.paymentAmount" clearable :disabled="taskName != '合同拟稿'"></el-input>
                 </td>
                 <td>
-                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd"
-                    type="date" placeholder="选择日期" :disabled="taskName != '合同拟稿'">
+                  <el-date-picker style="width: 140px" v-model="payment.paymentTime" value-format="yyyy-MM-dd" type="date"
+                    placeholder="选择日期" :disabled="taskName != '合同拟稿'">
                   </el-date-picker>
                 </td>
                 <td>
@@ -193,7 +185,7 @@
               :disabled="taskName != '合同拟稿'"></el-button>
           </el-form-item>
           <el-form-item label="合同备注" prop="remark">
-            <el-input v-model="form.remark" placeholder="请输入合同备注" :disabled="taskName != '合同拟稿'" />
+            <el-input type="textarea" v-model="form.remark" placeholder="请输入合同备注" :disabled="taskName != '合同拟稿'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -249,11 +241,12 @@
                 </td>
                 <!-- 线上会审附件 -->
                 <td @click="clickFile(comment)">
-                  <FileUpload v-if="comment.document == ''" ref="hs" :limit="1" :filePathName="'分包合同文件'"
-                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && !comment.commentUser)"
+                  <FileUpload v-if="comment.document == '' || comment.document == null" ref="hs" :limit="1"
+                    :filePathName="'分包合同/线上会审意见'"
+                    :disabled="taskName != '线上会审' || (taskName == '线上会审' && comment.userId != userId)"
                     :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="setCommentDocument">
                   </FileUpload>
-                  <div v-if="comment.document != ''">
+                  <div v-if="comment.document != '' && comment.document != null">
                     <transition-group class="upload-file-list el-upload-list el-upload-list--text"
                       name="el-fade-in-linear" tag="ul">
                       <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
@@ -323,10 +316,10 @@
               <tr>
                 <td>评审意见表</td>
                 <td colspan="5" style="text-align:left;">
-                  <FileUpload v-if="taskName == '会议评审'" ref="contractFile" :limit="1" :filePathName="'分包合同文件'"
-                    :disabled="taskName != '会议评审'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
-                    @input="getMeetingPath"></FileUpload>
-                  <div v-if="taskName != '会议评审'">
+                  <FileUpload v-if="meetingForm.document == null || meetingForm.document == ''" ref="contractFile"
+                    :limit="1" :filePathName="'分包合同/会议评审意见'" :disabled="taskName != '会议评审'"
+                    :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getMeetingPath"></FileUpload>
+                  <div v-if="meetingForm.document != null && meetingForm.document != ''">
                     <file-item :document="meetingForm.document"></file-item>
                   </div>
                 </td>
@@ -369,18 +362,18 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="签订日期" prop="signDate">
-            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择签订日期" :disabled="taskName != '合同签订'">
+            <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期"
+              :disabled="taskName != '合同签订'">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="签订备注" prop="signRemark">
             <el-input v-model="form.signRemark" type="textarea" placeholder="请输入签订备注" :disabled="taskName != '合同签订'" />
           </el-form-item>
           <el-form-item label="签订扫描件" prop="signScan">
-            <FileUpload v-if="taskName == '合同签订'" :limit="1" :filePathName="'分包合同文件'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getSignScanPath">
+            <FileUpload :disabled="taskName != '合同签订'" v-if="form.signScan == null || form.signScan == ''" :limit="1"
+              :filePathName="'分包合同文件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getSignScanPath">
             </FileUpload>
-            <div v-if="taskName != '合同签订'">
+            <div v-if="form.signScan != null && form.signScan != ''">
               <file-item :document="form.signScan"></file-item>
             </div>
           </el-form-item>
@@ -581,7 +574,7 @@ export default {
       isSelect: false,
       formTotal: 0,
       flowData: {},
-      clickTd:{}
+      clickTd: {}
     };
   },
   created() {
@@ -1070,6 +1063,7 @@ table {
   /* border: 1px solid black; */
   text-align: center;
   border-collapse: collapse;
+
   /*设置背景颜色*/
   /* background-color: #bfa; */
   td {

oa-ui/src/views/flowable/form/components/chooseTender.vue

@@ -22,6 +22,7 @@
 
     <el-table ref="choosePTender" v-loading="loading" :data="tenderList" highlight-current-row
       @current-change="handleCurrentChange" :row-key="getRowKeys" @row-dblclick="confirmChoose">
+      <el-table-column type="selection" width="50" align="center" :reserve-selection="true" />
       <el-table-column label="投标项目名称" align="center" key="projectName" prop="projectName"
         :show-overflow-tooltip="true"  width="170px" />
       <el-table-column label="招标业主" align="center" prop="partyA" min-width="100px" />

oa-ui/src/views/flowable/form/finance/borrowForm.vue

@@ -3,6 +3,7 @@
     <el-row :gutter="20">
       <el-col :span="18" :xs="24">
         <h2 class="text-center">借款申请</h2>
+        <el-divider></el-divider>
         <el-form ref="form" :model="form" :rules="rules" label-width="125px">
           <el-row :gutter="20">
             <el-col :span="6" :xs="24">
@@ -36,12 +37,13 @@
             <el-input v-model="form.applyReason" :disabled="taskName != '借款申请'"></el-input>
           </el-form-item>
           <el-form-item label="项目编号" prop="projectId" v-if="taskForm.procDefName == '借款审批' && isProject">
-            <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
+            <el-button type="primary" size="mini" @click="openProject = true" v-if="taskName == '借款申请'">选择项目</el-button>
+            <!-- <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
               :disabled="taskName != '借款申请'" clearable>
               <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber"
                 :value="item.projectId">
               </el-option>
-            </el-select>
+            </el-select> -->
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
               }}</el-descriptions-item>
@@ -124,20 +126,11 @@
             <el-input type="textarea" v-model="form.remark" placeholder="请输入申请人说明" :disabled="taskName != '借款申请'" />
           </el-form-item>
           <el-form-item label="附件上传" prop="borrowDocument">
-            <FileUpload v-if="taskName == '借款申请'" :limit="1" :filePathName="'借款/申请附件'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getBorrowPath"></FileUpload>
-            <div>
-              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
-                tag="ul">
-                <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
-                  <el-link :href="`${baseUrl}${'/profile/upload' + form.borrowDocument}`" :underline="false"
-                    target="_blank">
-                    <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
-                      {{ getFileName(form.borrowDocument) }}
-                    </span>
-                  </el-link>
-                </li>
-              </transition-group>
+            <FileUpload v-if="form.borrowDocument == null || form.borrowDocument == ''" :disabled="taskName != '借款申请'"
+              :limit="1" :filePathName="'借款/申请附件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+              @input="getBorrowPath"></FileUpload>
+            <div v-if="form.borrowDocument != null && form.borrowDocument != ''">
+              <file-item :document="form.borrowDocument"></file-item>
             </div>
           </el-form-item>
           <el-divider></el-divider>
@@ -229,20 +222,11 @@
           </div>
           <el-divider></el-divider>
           <el-form-item label="支付凭证" prop="lendDocument">
-            <FileUpload v-if="showFormItem('财务处理')" :limit="1" :filePathName="'借款/支付凭证'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getLendPath"></FileUpload>
-            <div v-if="showFormItem('财务处理')">
-              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
-                tag="ul">
-                <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
-                  <el-link :href="`${baseUrl}${'/profile/upload' + form.lendDocument}`" :underline="false"
-                    target="_blank">
-                    <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
-                      {{ getFileName(form.lendDocument) }}
-                    </span>
-                  </el-link>
-                </li>
-              </transition-group>
+            <FileUpload v-if="form.lendDocument == null || form.lendDocument == ''" :disabled="taskName != '财务处理'"
+              :limit="1" :filePathName="'借款/支付凭证'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getLendPath">
+            </FileUpload>
+            <div v-if="form.lendDocument != null && form.lendDocument != ''">
+              <file-item :document="form.lendDocument"></file-item>
             </div>
           </el-form-item>
           <el-form-item label="财务部支付备注" prop="cwComment">
@@ -277,6 +261,9 @@
         </el-card>
       </el-col>
     </el-row>
+    <el-dialog title="选择项目" :visible.sync="openProject" width="70%" append-to-body>
+      <project-choose @chooseProject="confirmProject"></project-choose>
+    </el-dialog>
   </div>
 </template>
 
@@ -290,10 +277,14 @@ import { getUserByPost } from "@/api/system/post";
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
+import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
+import FileItem from '../business/fileItem.vue';
 
 export default {
   components: {
-    flow
+    flow,
+    projectChoose,
+    FileItem
   },
   name: "Borrow",
   props: {
@@ -338,6 +329,7 @@ export default {
       projectList: [],
       chooseProject: {},
       isSelect: false,
+      openProject: false,
       // 表单参数
       form: {
         borrowUsage: '0',
@@ -581,6 +573,7 @@ export default {
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
               let userId;
+              console.log(this.deptId);
               if (this.deptId == 0) {
                 if (this.form.borrowUsage == 2 || this.form.borrowUsage == 3) {
                   userId = this.publicData.partySecretary
@@ -628,6 +621,17 @@ export default {
         isShow = (this.taskName == '财务处理');
       return isShow;
     },
+    confirmProject(val) {
+      if (val.length > 1) {
+        this.$message.error('请选择一个项目');
+        return
+      } else if (val.length == 1) {
+        this.chooseProject = val[0]
+        this.isSelect = true
+        this.form.projectId = val[0].projectId
+      }
+      this.openProject = false
+    },
     calculateAmount(detail) {
       let total = Number(detail.price) * Number(detail.quantity);
       this.$set(detail, "applyAmount", total.toFixed(2));
@@ -660,22 +664,17 @@ export default {
         this.form.lendDocument = ""
       }
     },
-    getFileName(name) {
-      if (name) {
-        let arr = name.split('/')
-        return arr[arr.length - 1];
-      }
-    },
     // 修改借款类型
     hanldeChangeType() {
       if (this.form.borrowUsage == '0') {
-        this.dgtLabel = '工会审核意见'
-        this.isProject = true
-      } else {
-        this.isProject = false
-      }
-      if (this.form.borrowUsage == '2' || this.form.borrowUsage == '3' || this.form.borrowUsage == '4') {
-        this.deptId = 0
+        this.deptId = this.$store.getters.deptId;
+        this.isProject = true;
+      } else if (this.form.borrowUsage == '1') {
+        this.deptId = this.$store.getters.deptId;
+        this.isProject = false;
+      } else if (this.form.borrowUsage == '2' || this.form.borrowUsage == '3' || this.form.borrowUsage == '4') {
+        this.deptId = 0;
+        this.isProject = false;
         if (this.form.borrowUsage == '2') {
           this.dgtLabel = '工会审核意见'
         } else if (this.form.borrowUsage == '3') {

oa-ui/src/views/flowable/form/finance/depositForm.vue

@@ -84,26 +84,15 @@
             </el-col>
           </el-row>
           <el-form-item label="申请说明" prop="applyReason">
-            <el-input type="textarea" v-model="form.applyReason" placeholder="请输入申请说明" :disabled="taskName != '保证金申请'" />
+            <el-input type="textarea" :rows="2" v-model="form.applyReason" placeholder="请输入申请说明"
+              :disabled="taskName != '保证金申请'" />
           </el-form-item>
           <el-form-item label="相关附件" prop="applyDocument">
-            <el-input v-model="form.applyDocument" placeholder="请输入相关附件" :disabled="taskName != '保证金申请'" />
-          </el-form-item>
-          <el-form-item label="相关附件" prop="applyDocument">
-            <FileUpload v-if="taskName == '保证金申请'" :limit="1" :filePathName="'保证金/申请附件'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getApplyPath"></FileUpload>
-            <div>
-              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
-                tag="ul">
-                <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
-                  <el-link :href="`${baseUrl}${'/profile/upload' + form.applyDocument}`" :underline="false"
-                    target="_blank">
-                    <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
-                      {{ getFileName(form.applyDocument) }}
-                    </span>
-                  </el-link>
-                </li>
-              </transition-group>
+            <FileUpload v-if="form.applyDocument == null || form.applyDocument == ''" :disabled="taskName != '保证金申请'"
+              :limit="1" :filePathName="'保证金/申请附件'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+              @input="getApplyPath"></FileUpload>
+            <div v-if="form.applyDocument != null && form.applyDocument != ''">
+              <file-item :document="form.applyDocument"></file-item>
             </div>
           </el-form-item>
           <el-row :gutter="20">
@@ -120,7 +109,8 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="分管审批意见" prop="managerComment">
-            <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" :disabled="taskName != '分管审批'" />
+            <el-input type="textarea" v-model="form.managerComment" placeholder="请输入分管审批意见"
+              :disabled="taskName != '分管审批'" />
           </el-form-item>
           <el-row :gutter="20">
             <el-col :span="6" :offset="12" :xs="24">
@@ -136,24 +126,15 @@
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="汇款凭证" prop="remitDocument">
-            <FileUpload v-if="taskName == '财务处理'" :limit="1" :filePathName="'保证金/汇款凭证'"
-              :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']" @input="getRemitPath"></FileUpload>
-            <div v-if="taskName == '财务处理'">
-              <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear"
-                tag="ul">
-                <li key="li01" class="el-upload-list__item ele-upload-list__item-content">
-                  <el-link :href="`${baseUrl}${'/profile/upload' + form.remitDocument}`" :underline="false"
-                    target="_blank">
-                    <span class="el-icon-document" style="color:#0011ff;text-decoration: underline;">
-                      {{ getFileName(form.remitDocument) }}
-                    </span>
-                  </el-link>
-                </li>
-              </transition-group>
+            <FileUpload v-if="form.remitDocument == null || form.remitDocument == ''" :disabled="taskName != '财务处理'"
+              :limit="1" :filePathName="'保证金/汇款凭证'" :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf']"
+              @input="getRemitPath"></FileUpload>
+            <div v-if="form.remitDocument != null && form.remitDocument != ''">
+              <file-item :document="form.remitDocument"></file-item>
             </div>
           </el-form-item>
           <el-form-item label="财务打款备注" prop="cwComment">
-            <el-input v-model="form.cwComment" placeholder="请输入财务打款备注" :disabled="taskName != '财务处理'" />
+            <el-input type="textarea" v-model="form.cwComment" placeholder="请输入财务打款备注" :disabled="taskName != '财务处理'" />
           </el-form-item>
           <el-row>
             <el-col :span="12" :xs="24">
@@ -212,10 +193,12 @@ import { getUsersManageLeader, getUsersDeptLeaderByDept, getUsersViceDeptLeaderB
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
+import FileItem from '../business/fileItem.vue';
 
 export default {
   components: {
-    flow
+    flow,
+    FileItem
   },
   props: {
     taskName: {
@@ -536,7 +519,7 @@ export default {
                     this.$modal.msgSuccess(response.msg);
                     this.$emit('goBack')
                   })
-                }                  
+                }
               }
             })
           } else {
@@ -576,7 +559,7 @@ export default {
       this.download('oa/deposit/export', {
         ...this.queryParams
       }, `deposit_${new Date().getTime()}.xlsx`)
-    },    
+    },
     getApplyPath(val) {
       let arr = val.split('/upload')
       this.form.applyDocument = arr[1]
@@ -591,12 +574,6 @@ export default {
         this.form.remitDocument = ""
       }
     },
-    getFileName(name) {
-      if (name) {
-        let arr = name.split('/')
-        return arr[arr.length - 1];
-      }
-    },
   }
 };
 </script>

oa-ui/src/views/flowable/form/oa/deviceForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
  * @LastEditors: wrh
- * @LastEditTime: 2024-05-24 09:27:36
+ * @LastEditTime: 2024-05-29 10:16:20
 -->
 
 <template>
@@ -37,12 +37,14 @@
                 </el-col>
               </el-row>
               <el-form-item label="项目编号：" prop="projectId">
-                <el-select v-model="form.projectId" filterable allow-create placeholder="请选择"
+                <el-button type="primary" size="mini" @click="openProject = true"
+                  v-if="taskName == '设备申请'">选择项目</el-button>
+                <!-- <el-select v-model="form.projectId" filterable allow-create placeholder="请选择"
                   @change="handleSelectProject" clearable :disabled="taskName != '设备申请'">
                   <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber"
                     :value="item.projectId">
                   </el-option>
-                </el-select>
+                </el-select> -->
                 <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
                   <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
                   }}</el-descriptions-item>
@@ -59,11 +61,11 @@
                 </el-descriptions>
               </el-form-item>
               <el-form-item label="设备选择：">
-                <el-select style="width: 100%;" v-model="form.devices" filterable multiple placeholder="请选择"
-                  clearable :disabled="taskName != '设备申请'">
-                  <el-option v-for="item in deviceList" :key="item.deviceId" :disabled="item.status != 1"
-                    :label="item.name +'【' +  (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series  + '】': '')
-                     + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place"  :value="item.deviceId">
+                <el-select style="width: 100%;" v-model="form.devices" filterable multiple placeholder="请选择" clearable
+                  :disabled="taskName != '设备申请'">
+                  <el-option v-for="item in deviceList" :key="item.deviceId" :disabled="item.status != 1" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
+                    + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place"
+                    :value="item.deviceId">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -98,9 +100,9 @@
               <el-form-item label-width="120px" label="拟发放设备：">
                 <el-select style="width: 100%;" v-model="form.modifyDevices" filterable multiple placeholder="请选择"
                   clearable :disabled="taskName != '安排设备'">
-                  <el-option v-for="item in deviceList" :key="item.deviceId" :disabled="item.status != 1" 
-                    :label="item.name +'【' +  (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series  + '】': '')
-                     + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place"  :value="item.deviceId">
+                  <el-option v-for="item in deviceList" :key="item.deviceId" :disabled="item.status != 1" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
+                    + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place"
+                    :value="item.deviceId">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -144,12 +146,12 @@
               </el-row>
               <!-- 归还确认 -->
               <el-divider></el-divider>
-              <el-form-item label="需维修设备：" prop="state" label-width="120px">                
+              <el-form-item label="需维修设备：" prop="state" label-width="120px">
                 <el-select style="width: 100%;" v-model="form.repairDevices" filterable multiple placeholder="请选择"
                   clearable :disabled="taskName != '归还确认'">
-                  <el-option v-for="item in modifyDeviceList" :key="item.deviceId"
-                    :label="item.name +'【' +  (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series  + '】': '')
-                     + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place"  :value="item.deviceId">
+                  <el-option v-for="item in modifyDeviceList" :key="item.deviceId" :label="item.name + '【' + (item.brand != null ? item.brand : '') + (item.series != null ? '-' + item.series + '】' : '')
+                    + (item.code != null ? '（设备编号：' + item.code + '）' : '') + '📍' + item.place"
+                    :value="item.deviceId">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -184,7 +186,9 @@
 
       </el-col>
     </el-row>
-
+    <el-dialog title="选择项目" :visible.sync="openProject" width="70%" append-to-body>
+      <project-choose @chooseProject="confirmProject"></project-choose>
+    </el-dialog>
   </div>
 </template>
 
@@ -200,9 +204,11 @@ import { getUsersManageLeader } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { getUserByRole } from "@/api/system/role";
+import projectChoose from '@/views/flowable/form/components/chooseProject.vue';
 export default {
   components: {
-    flow
+    flow,
+    projectChoose
   },
   props: {
     taskName: {
@@ -253,6 +259,7 @@ export default {
       chooseProject: {},
       flowData: {},
       isSelect: false,
+      openProject: false,
       rules: {
         beginDate: [
           { required: true, message: '请选择开始日期', trigger: 'change' },
@@ -357,7 +364,7 @@ export default {
     },
     // 获取下一个审批人
     getNextFlowNodeApproval() {
-      if (this.taskName == '设备申请') {        
+      if (this.taskName == '设备申请') {
         getUserByRole({ roleId: 5 }).then(result => {
           this.$set(this.taskForm.variables, "approval", result.data[0]);
           complete(this.taskForm).then(response => {
@@ -458,6 +465,17 @@ export default {
         isShow = this.taskName == '分管审核' || ((this.taskName == '安排设备' || this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.managerUserId != null);
       return isShow;
     },
+    confirmProject(val) {
+      if (val.length > 1) {
+        this.$message.error('请选择一个项目');
+        return
+      } else if (val.length == 1) {
+        this.chooseProject = val[0]
+        this.isSelect = true
+        this.form.projectId = val[0].projectId
+      }
+      this.openProject = false
+    },
   },
 }
 </script>