更新

admin-ui/src/assets/styles/extend.scss

@@ -2,13 +2,13 @@
 .vl-notify-mask {
   background-color: black !important;
   opacity: 0.4 !important;
-  z-index: 1503 !important;
+  z-index: 1504 !important;
 }
 .vl-notify.vl-notify-msg.vl-notify-loading {
   z-index: 1505 !important;
 }
 .vl-notify.vl-notify-iframe {
-  z-index: 1503 !important;
+  z-index: 1504 !important;
   border: 0px !important;
   border-radius: 10px !important;
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2) !important;

app/components/signature/signature.vue

@@ -109,7 +109,6 @@ export default {
 	},
 	mounted() {
 		this.prevView = this.value;
-		console.log('dx');
 	},
 	methods: {
 		onOK() {

app/pages.json

@@ -47,7 +47,7 @@
 		{
 			"path": "pages/company/search",
 			"style": {
-				"navigationBarTitleText": "手动关联",
+				"navigationBarTitleText": "搜索企业",
 				"enablePullDownRefresh": false
 			}
 		},

app/pages/company/index.vue

@@ -1,21 +1,22 @@
 <template>
 	<view>
 		<view class="tab">
-			<u-tabs :list="tab" :current="0"></u-tabs>
+			<u-tabs :list="tab" :current="current" @click="click"></u-tabs>
 		</view>
 		<view class="list">
 			<view class="item" v-for="(item, index) in list" :key="index">
 				<view class="title">{{ item.companyName }}</view>
 				<view class="op">
 					<text>{{ item.createTime }}</text>
-					<text class="del" @click="del(item)">解除</text>
+					<text class="add" @click="del(item)" v-if="current == 0">点击关联</text>
+					<text class="del" @click="del(item)" v-else>解除</text>
 				</view>
 			</view>
 			<view class="loading" v-if="loadMore"><u-loadmore :status="loadMore ? 'loading' : 'nomore'" /></view>
 			<u-empty v-if="!loadMore && list.length == 0" text="尚未关联公司"></u-empty>
 		</view>
 		<view class="footer">
-			<view class="db"><button class="btn" @click="show = true">关联企业</button></view>
+			<view class="db"><button class="btn" @click="show = true">手动关联</button></view>
 		</view>
 		<u-action-sheet round="20" :actions="actions" @select="selectClick" cancelText="取消" :show="show" @close="show = false"></u-action-sheet>
 	</view>
@@ -25,11 +26,12 @@
 export default {
 	data() {
 		return {
-			tab: [{ name: '全部' }],
+			tab: [{ name: '企业大厅' }, { name: '我的关联' }],
 			show: false,
-			actions: [{ name: '扫码关联' }, { name: '手动关联' }],
+			current: 0,
+			actions: [{ name: '扫码关联' }, { name: '搜索企业' }],
 			list: [],
-			param: { pageNum: 1, pageSize: 10, orderByColumn: 'createTime', isAsc: 'desc' },
+			param: { pageNum: 1, pageSize: 10 },
 			loadMore: true
 		};
 	},
@@ -42,7 +44,7 @@ export default {
 	methods: {
 		getData() {
 			this.http.request({
-				url: '/app/relate/list',
+				url: this.current == 0 ? '/app/company/list' : '/app/relate/list',
 				data: this.param,
 				loading: 'false',
 				success: (res) => {
@@ -54,15 +56,20 @@ export default {
 				}
 			});
 		},
+		click(e) {
+			this.current = e.index;
+			this.param.state = e.index === 1 ? 0 : 1;
+			this.refresh();
+		},
 		selectClick(e) {
-			if (e.name == '手动关联') {
+			if (e.name == '搜索企业') {
 				uni.navigateTo({ url: '/pages/company/search' });
 			} else {
 				uni.scanCode({
 					success: (res) => {
 						this.http.request({
 							url: '/app/relate/add',
-							data: { companyId: res.result,way:'扫码关联' },
+							data: { companyId: res.result, way: '扫码关联' },
 							method: 'POST',
 							success: (res) => {
 								uni.showModal({
@@ -83,18 +90,36 @@ export default {
 		del(item) {
 			uni.showModal({
 				title: '提示',
-				content: '确定解除该企业关联?',
+				content: this.current == 0 ? '确定关联该企业?' : '确定解除该企业关联?',
 				success: (res) => {
 					if (res.confirm) {
-						this.http.request({
-							url: '/app/relate/remove',
-							data: { companyId: item.companyId },
-							method: 'POST',
-							success: (res) => {
-								uni.showToast({ title: '解除成功' });
-								this.list.splice(this.list.indexOf(item), 1);
-							}
-						});
+						if (this.current == 0) {
+							this.http.request({
+								url: '/app/relate/add',
+								data: { companyId: item.id, way: '手动关联' },
+								method: 'POST',
+								success: (res) => {
+									uni.showModal({
+										title: '提示',
+										content: '关联成功',
+										showCancel: false,
+										success: (res) => {
+											this.current = 1;
+										}
+									});
+								}
+							});
+						} else {
+							this.http.request({
+								url: '/app/relate/remove',
+								data: { companyId: item.companyId },
+								method: 'POST',
+								success: (res) => {
+									uni.showToast({ title: '解除成功' });
+									this.list.splice(this.list.indexOf(item), 1);
+								}
+							});
+						}
 					}
 				}
 			});
@@ -144,6 +169,10 @@ export default {
 				float: right;
 				color: #f44336;
 			}
+			.add {
+				float: right;
+				color: $main-color;
+			}
 		}
 	}
 }

app/pages/index/index.vue

@@ -60,11 +60,11 @@
 					<view class="int">
 						<view class="icon tb" style="color: rgb(250, 83, 118)">&#xe604;</view>
 						<view class="con">
-							<view class="bt">开始接包</view>
-							<view class="zt">{{ !user.isCompany || user.isCompany == 0 ? '请先签约' : '去接包' }}</view>
+							<view class="bt">进入承揽</view>
+							<view class="zt">{{ !user.isCompany || user.isCompany == 0 ? '请先签约' : '开始' }}</view>
 						</view>
 						<view class="state">
-							<view class="go" :style="{ backgroundColor: user.isCompany > 0 && user.isContract == 1 ? '#5a7afc' : '#d6d6d6' }" v-if="!user.isCompany || user.isCompany == 0 || user.isContract == 0">去接包</view>
+							<view class="go" :style="{ backgroundColor: user.isCompany > 0 && user.isContract == 1 ? '#5a7afc' : '#d6d6d6' }" v-if="!user.isCompany || user.isCompany == 0 || user.isContract == 0">进入</view>
 						</view>
 					</view>
 				</view>

app/pages/packages/index.vue

@@ -23,7 +23,7 @@
 				</view>
 				<view class="op">
 					<text>{{ item.createTime }}</text>
-					<text class="add" @click="add(item)" v-if="current == 0">接包</text>
+					<text class="add" @click="add(item)" v-if="current == 0">接任务</text>
 					<text class="add" @click="voucher(item)" v-if="current == 1 && item.audit == 0">上传凭证</text>
 					<text class="add" @click="voucher(item)" v-if="current == 1 && item.audit == 1">已上传凭证</text>
 					<text class="add" @click="voucher(item)" v-if="current == 1 && item.audit == 3" style="background-color: #f44336">凭证驳回，请重新上传</text>
@@ -42,8 +42,8 @@ export default {
 	data() {
 		return {
 			show: false,
-			current: 1,
-			tab: [{ name: '待接包' }, { name: '已接包' }, { name: '已完成' }],
+			current: 0,
+			tab: [{ name: '待接任务' }, { name: '已接任务' }, { name: '完成任务' }],
 			list: [],
 			param: { pageNum: 1, pageSize: 10, state: 0 },
 			loadMore: true

app/pages/user/index.vue

@@ -30,7 +30,7 @@
 			</view>
 			<view class="s_item" @click="go('packages')">
 				<text class="icon ic">&#xe604;</text>
-				<text class="title">我的接包</text>
+				<text class="title">我的承揽</text>
 				<text class="icon arrow">&#xe62b;</text>
 			</view>
 		</view>
@@ -46,8 +46,8 @@ export default {
 		};
 	},
 	onShow() {
-		 		 /* this.user = {
-			token: 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjllZjljY2QyLWM4ZmYtNGU2NS1hM2EwLWZlMzUzNWUxMzQ5MyJ9.ll0aR92AP8iZgQ4pVpQwfxcyIDKdPwkZA23uU_0ON_tAaxlepQqU04pbNPIx1vMKjADecBsvxB3vyfYDDATl3g'
+		 		  /* this.user = {
+			token: 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImI0M2FmZjFmLWQ1YWMtNDk3Yi1hNDNiLTEwYTRiMmJmYmI4YiJ9.2IEItPPaVUBQw416MK9SA6OM_PE5WgcpvTdVf_-KJ8AQsI1J9PzMlRiA2ZCQT6gdHbY9l9wS1ZxQzdIxTx9PjQ'
 		};
 		uni.setStorageSync('user', this.user); */
 		if (this.hasLogin()) {

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_CompanyController.java

@@ -1,15 +1,17 @@
 package com.ruoyi.web.work.api;
 
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.web.work.domain.dto.CompanyDto;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.web.work.domain.Company;
+import com.ruoyi.web.work.domain.vo.CompanyListVo;
 import com.ruoyi.web.work.service.ICompanyService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 企业管理
  *
@@ -23,7 +25,9 @@ public class Api_CompanyController extends BaseController {
     private ICompanyService companyService;
 
     @GetMapping("/list")
-    public AjaxResult list(@Validated CompanyDto dto) {
-        return AjaxResult.success(companyService.selectCompanyList(dto));
+    public TableDataInfo list(Company company) {
+        startPage();
+        List<CompanyListVo> list = companyService.selectCompanyList(company);
+        return getDataTable(list);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/vo/CompanyListVo.java

@@ -1,9 +1,12 @@
 package com.ruoyi.web.work.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * @author lsw
  * @date 2024-04-16
@@ -18,4 +21,7 @@ public class CompanyListVo {
     @ApiModelProperty(value = "企业名称")
     private String companyName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/CompanyMapper.java

@@ -2,7 +2,6 @@ package com.ruoyi.web.work.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.web.work.domain.Company;
-import com.ruoyi.web.work.domain.dto.CompanyDto;
 import com.ruoyi.web.work.domain.vo.CompanyListVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -16,7 +15,7 @@ import java.util.List;
 public interface CompanyMapper extends BaseMapper<Company> {
     List<Company> selectList(Company company);
 
-    List<CompanyListVo> selectCompanyList(CompanyDto dto);
+    List<CompanyListVo> selectCompanyList(Company company);
 
     @Select("SELECT * FROM tb_company WHERE company_name=#{companyName}")
     Company selectByCompanyName(@Param("companyName") String companyName);

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/ICompanyService.java

@@ -3,7 +3,6 @@ package com.ruoyi.web.work.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.web.work.domain.Company;
-import com.ruoyi.web.work.domain.dto.CompanyDto;
 import com.ruoyi.web.work.domain.dto.LockDto;
 import com.ruoyi.web.work.domain.vo.CompanyListVo;
 
@@ -17,7 +16,7 @@ import java.util.List;
 public interface ICompanyService extends IService<Company> {
     List<Company> selectList(Company company);
 
-    List<CompanyListVo> selectCompanyList(CompanyDto dto);
+    List<CompanyListVo> selectCompanyList(Company company);
 
     AjaxResult add(Company company) throws ServerException;
 

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/CompanyServiceImpl.java

@@ -8,7 +8,6 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.framework.web.service.SysPermissionService;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.web.work.domain.Company;
-import com.ruoyi.web.work.domain.dto.CompanyDto;
 import com.ruoyi.web.work.domain.dto.LockDto;
 import com.ruoyi.web.work.domain.vo.CompanyListVo;
 import com.ruoyi.web.work.mapper.CompanyMapper;
@@ -42,8 +41,8 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     }
 
     @Override
-    public List<CompanyListVo> selectCompanyList(CompanyDto dto) {
-        return companyMapper.selectCompanyList(dto);
+    public List<CompanyListVo> selectCompanyList(Company company) {
+        return companyMapper.selectCompanyList(company);
     }
 
     @Transactional(rollbackFor = Exception.class)

ruoyi-admin/src/main/resources/mapper/work/CompanyMapper.xml

@@ -29,7 +29,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectCompanyList" resultType="com.ruoyi.web.work.domain.vo.CompanyListVo">
-        SELECT * FROM tb_company WHERE state=0 AND company_name like concat('%', #{companyName}, '%')
+        SELECT * FROM tb_company
+        WHERE state=0
+        <if test="companyName != null  and companyName != ''">AND company_name like concat('%', #{companyName}, '%')</if>
+        ORDER BY id DESC
     </select>
 
 </mapper>