From 71e2d06dfa28d3bd60b0d9fa6d6c7ff32884a1a9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 14:04:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/business/OpearaUnionChange.vue | 1
company/src/views/enterprise/entrustedInvoicing.vue | 6 +-
company/src/components/enterprise/additionSubtractionApplication.vue | 4
company/src/components/enterprise/OperaInsuranceApplyWindow.vue | 5 +
company/src/components/enterprise/reinsurance.vue | 4
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 60 +++++++++++--------
company/src/components/business/OpearaUnionChangeUnit.vue | 1
company/.env.developmentCom | 4
company/.env.productionShop | 4
server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java | 6 +-
company/src/components/business/OperaUnionApplyCheckWindow.vue | 4 +
company/.env.developmentShop | 4
company/src/views/indexShop.vue | 1
company/src/components/business/OpearaUnionApply.vue | 4
company/.env.productionCom | 4
company/src/components/enterprise/confirmJobType.vue | 5 +
company/.env.development | 4
17 files changed, 72 insertions(+), 49 deletions(-)
diff --git a/company/.env.development b/company/.env.development
index 1b1927b..b922744 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -7,6 +7,6 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
- VUE_APP_API = 'http://192.168.0.190:10030/'
+# VUE_APP_API = 'http://192.168.0.190:10030/'
-#VUE_APP_API = 'http://localhost:10030/'
+VUE_APP_API = 'http://localhost:10030/'
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index 0c2415e..80addd9 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -7,6 +7,6 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
- VUE_APP_API = 'http://192.168.0.190:10031/'
+#VUE_APP_API = 'http://192.168.0.190:10031/'
-#VUE_APP_API = 'http://localhost:10030/'
+VUE_APP_API = 'http://localhost:10031/'
diff --git a/company/.env.developmentShop b/company/.env.developmentShop
index b55a1b8..8bbdc82 100644
--- a/company/.env.developmentShop
+++ b/company/.env.developmentShop
@@ -7,6 +7,6 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
- VUE_APP_API = 'http://192.168.0.190:10032/'
+#VUE_APP_API = 'http://192.168.0.190:10032/'
-#VUE_APP_API = 'http://localhost:10030/'
+VUE_APP_API = 'http://localhost:10032/'
diff --git a/company/.env.productionCom b/company/.env.productionCom
index 9cf23b3..904fb6a 100644
--- a/company/.env.productionCom
+++ b/company/.env.productionCom
@@ -1,10 +1,10 @@
# 鐢熶骇鐜閰嶇疆
NODE_ENV = 'production'
-VUE_APP_API_PREFIX = '/yyb_admin_api'
+VUE_APP_API_PREFIX = '/yyb_web_api'
# 骞冲彴绔�
-VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
+VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
# 浼佷笟绔�
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
diff --git a/company/.env.productionShop b/company/.env.productionShop
index 9cf23b3..d53a8c9 100644
--- a/company/.env.productionShop
+++ b/company/.env.productionShop
@@ -1,10 +1,10 @@
# 鐢熶骇鐜閰嶇疆
NODE_ENV = 'production'
-VUE_APP_API_PREFIX = '/yyb_admin_api'
+VUE_APP_API_PREFIX = '/yyb_shop_api'
# 骞冲彴绔�
-VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
+VUE_APP_API = 'https://dmtest.ahapp.net/yyb_shop_api/'
# 浼佷笟绔�
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_web_api/'
diff --git a/company/src/components/business/OpearaUnionApply.vue b/company/src/components/business/OpearaUnionApply.vue
index b76e31c..41a3126 100644
--- a/company/src/components/business/OpearaUnionApply.vue
+++ b/company/src/components/business/OpearaUnionApply.vue
@@ -213,8 +213,8 @@
},
changeTime (e) {
if (e.length > 0) {
- this.form.startDate = e[0]
- this.form.endDate = e[1]
+ this.form.startDate = e[0]+ ' 00:00:00'
+ this.form.endDate = e[1] + ' 23:59:59'
} else {
this.form.startDate = ''
this.form.endDate = ''
diff --git a/company/src/components/business/OpearaUnionChange.vue b/company/src/components/business/OpearaUnionChange.vue
index b8285f9..7bff961 100644
--- a/company/src/components/business/OpearaUnionChange.vue
+++ b/company/src/components/business/OpearaUnionChange.vue
@@ -21,6 +21,7 @@
v-model="form.applyDate"
type="date"
format="yyyy 骞� MM 鏈� dd 鏃�"
+ placeholder="鍓嶉�夋嫨鏃ユ湡"
value-format="yyyy-MM-dd" />
<span style="color: #F95601; font-size: 14px;">锛�2. 娆℃棩鐢熸晥鎶曚繚璇蜂簬17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
</div>
diff --git a/company/src/components/business/OpearaUnionChangeUnit.vue b/company/src/components/business/OpearaUnionChangeUnit.vue
index eca4962..61c4110 100644
--- a/company/src/components/business/OpearaUnionChangeUnit.vue
+++ b/company/src/components/business/OpearaUnionChangeUnit.vue
@@ -19,6 +19,7 @@
<div style="display: flex; flex-direction: column;">
<el-date-picker
v-model="form.applyDate"
+ placeholder="鍓嶉�夋嫨鏃ユ湡"
type="date"
format="yyyy 骞� MM 鏈� dd 鏃�"
value-format="yyyy-MM-dd" />
diff --git a/company/src/components/business/OperaUnionApplyCheckWindow.vue b/company/src/components/business/OperaUnionApplyCheckWindow.vue
index 9730d0f..be4f290 100644
--- a/company/src/components/business/OperaUnionApplyCheckWindow.vue
+++ b/company/src/components/business/OperaUnionApplyCheckWindow.vue
@@ -44,6 +44,7 @@
<el-form-item label="淇濋櫓鐢熸晥姝㈡湡锛�" prop="endTime" v-if="form.selectRadio === 1">
<el-date-picker
v-model="form.endTime"
+ @change="changEndTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="閫夋嫨鏃ユ湡">
@@ -161,6 +162,9 @@
})
},
methods: {
+ changEndTime(){
+ this.form.endTime=this.form.endTime.replace(" 00:00:00"," 23:59:59")
+ },
dele2 () {
this.form.toubaodanFile= null
},
diff --git a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
index 7fcb3e3..535c8b6 100644
--- a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
@@ -117,6 +117,9 @@
<el-table-column
prop="fee"
label="璐圭敤">
+ <template slot-scope="{row}">
+ {{item.type==1?'-':row.fee}}
+ </template>
</el-table-column>
<el-table-column
label="鎿嶄綔">
@@ -299,7 +302,7 @@
this.tableData.forEach(item => {
total += item.fee
})
- sums[index] = total
+ sums[index] = total.toFixed(2)
}
})
return sums
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index fe4a742..d021461 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -328,12 +328,12 @@
this.form.addDetailList.forEach(item => {
total += item.fee
})
- sums[index] = total
+ sums[index] = total.toFixed(2)
} else {
this.form.delDetailList.forEach(item => {
total += item.fee
})
- sums[index] = '-' + total
+ sums[index] = '-' + total.toFixed(2)
}
}
})
diff --git a/company/src/components/enterprise/confirmJobType.vue b/company/src/components/enterprise/confirmJobType.vue
index 09b1325..638a430 100644
--- a/company/src/components/enterprise/confirmJobType.vue
+++ b/company/src/components/enterprise/confirmJobType.vue
@@ -60,6 +60,7 @@
this.form.solutionId = arr.solutionId
this.data = arr.seleData
this.visible = true
+ this.options=[]
this.getFindListByDTO()
},
getFindListByDTO () {
@@ -84,6 +85,10 @@
})
},
confirm() {
+ if(!this.dw || !this.gz){
+ this.$message.error("璇峰厛閫夋嫨娲鹃仯鍗曚綅鍜屽伐绉嶏紒")
+ return;
+ }
let obj = {
workTypeName: '',
worktypeId: '',
diff --git a/company/src/components/enterprise/reinsurance.vue b/company/src/components/enterprise/reinsurance.vue
index a3e573e..88a5376 100644
--- a/company/src/components/enterprise/reinsurance.vue
+++ b/company/src/components/enterprise/reinsurance.vue
@@ -415,14 +415,14 @@
this.form.addDetailList.forEach(item => {
total += item.fee
})
- sums[index] = total
+ sums[index] = total.toFixed(2)
return
} else {
this.form.delDetailList.forEach(item => {
total += item.fee
})
// if (total < 0) {
- sums[index] = total
+ sums[index] = total.toFixed(2)
// } else {
// sums[index] = '-' + total
// }
diff --git a/company/src/views/enterprise/entrustedInvoicing.vue b/company/src/views/enterprise/entrustedInvoicing.vue
index d6708c6..20a1018 100644
--- a/company/src/views/enterprise/entrustedInvoicing.vue
+++ b/company/src/views/enterprise/entrustedInvoicing.vue
@@ -77,7 +77,7 @@
return {
searchForm: {
type: 1,
- status: '5,7'
+ status: '5,27'
}
}
},
@@ -96,12 +96,12 @@
this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
return
}
- for (let i = 0; i < this.tableData.selectedRows.length; i++) {
+ /*for (let i = 0; i < this.tableData.selectedRows.length; i++) {
if (this.tableData.selectedRows[i].currentFee - this.tableData.selectedRows[i].taxesMoney === 0) {
this.$message.warning(`绗�${i + 1}椤瑰彲寮�绁ㄩ噾棰濅负0锛屼笉鑳借繘琛屽紑绁紒`)
return
}
- }
+ }*/
let obj = {}
obj.list = JSON.parse(JSON.stringify(this.tableData.selectedRows))
obj.list.forEach(item => {
diff --git a/company/src/views/indexShop.vue b/company/src/views/indexShop.vue
index 7f44181..a024993 100644
--- a/company/src/views/indexShop.vue
+++ b/company/src/views/indexShop.vue
@@ -92,7 +92,6 @@
<OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" @success="handleCurrentChange0()"/>
<OperaApplyChangeUnitDetailWindow ref="operaApplyChangeUnitDetailWindow" @success="handleCurrentChange0()"/>
<OperaApplyChangeDetailWindow ref="operaApplyChangeDetailWindow" @success="handleCurrentChange0()"/>
- <OperaTaxesWindow ref="OperaTaxesWindow" @success="handleCurrentChange1()"/>
</div>
</template>
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index ed13d2a..aafffd6 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -783,23 +783,26 @@
company.setIsdeleted(Constants.ZERO);
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Constants.equalsInteger(company.getType(),Constants.ONE)){
-
-
- }else {
- //濡傛灉鏌ヨ浼佷笟鏁版嵁
- if(company.getQueryFlag() == 0){
- //鍙兘鐪嬫潈闄愯寖鍥村唴
- if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
- wrapper.lambda().eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
- }else {
- wrapper.lambda().in(Company::getId, user.getCompanyIdList());
+ return new ArrayList<>();
+ }else {
+ if(Constants.equalsInteger(user.getType(),Constants.TWO)){
+ //濡傛灉鏄晢鎴�
+ wrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.shop_id=company.id");//璁剧疆鏃犳晥璁块棶
+ }else{
+ //濡傛灉鏌ヨ浼佷笟鏁版嵁
+ if(company.getQueryFlag() == 0){
+ //鍙兘鐪嬫潈闄愯寖鍥村唴
+ if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
+ wrapper.lambda().eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
+ }else {
+ wrapper.lambda().in(Company::getId, user.getCompanyIdList());
+ }
+ } else if (company.getQueryFlag() == 1 && company.getUserId()!=null) {
+ //鏌ヨ鏄惁鏈夋煡鐪嬫瑠闄�
+ wrapper.select("*,(select count(1) from company_permission b where b.user_id="+company.getUserId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
}
- } else if (company.getQueryFlag() == 1 && company.getUserId()!=null) {
- //鏌ヨ鏄惁鏈夋煡鐪嬫瑠闄�
- wrapper.select("*,(select count(1) from company_permission b where b.user_id="+company.getUserId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
}
}
-
return companyMapper.selectList(wrapper);
}
@@ -813,20 +816,27 @@
if(Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ONE) {
}else{
- //濡傛灉鏌ヨ浼佷笟鏁版嵁锛屽彧鑳界湅鏉冮檺鑼冨洿鍐�
- if(pageWrap.getModel().getQueryFlag() == 0){
- //鍙兘鐪嬫潈闄愯寖鍥村唴
- if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
- queryWrapper.lambda().eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
- }else {
- queryWrapper.lambda().in(Company::getId, user.getCompanyIdList());
- }
+ if(Constants.equalsInteger(user.getType(),Constants.TWO)){
+ //濡傛灉鏄晢鎴�
+ queryWrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.shop_id=company.id");//璁剧疆鏃犳晥璁块棶
+ }else{
+ //濡傛灉鏌ヨ浼佷笟鏁版嵁锛屽彧鑳界湅鏉冮檺鑼冨洿鍐�
+ if(pageWrap.getModel().getQueryFlag() == 0){
+ //鍙兘鐪嬫潈闄愯寖鍥村唴
+ if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
+ queryWrapper.lambda().eq(Company::getId,-1);//璁剧疆鏃犳晥璁块棶
+ }else {
+ queryWrapper.lambda().in(Company::getId, user.getCompanyIdList());
+ }
// queryWrapper.exists("select b.id from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id");
- } else if (pageWrap.getModel().getQueryFlag() == 1) {
- //鏌ヨ鏄惁鏈夋煡鐪嬫瑠闄�
- queryWrapper.select("*,(select count(1) from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
+ } else if (pageWrap.getModel().getQueryFlag() == 1) {
+ //鏌ヨ鏄惁鏈夋煡鐪嬫瑠闄�
+ queryWrapper.select("*,(select count(1) from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
+ }
}
+
}
+
if (pageWrap.getModel().getId() != null) {
queryWrapper.lambda().eq(Company::getId, pageWrap.getModel().getId());
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
index 99e04df..07d3cf7 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
@@ -370,12 +370,12 @@
if(solutions.getDataType() == null){
solutions.setDataType(Constants.TWO);
}
+ QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions);
if(Constants.equalsObject(user.getType(),Constants.TWO)){
//濡傛灉鏄垹闄�
- solutions.setShopId(user.getCompanyId());
- }
- QueryWrapper<Solutions> wrapper = new QueryWrapper<>(solutions);
+ wrapper.lambda().exists("select c.id from company_solution c left join solutions d on c.solution_id=d.id where c.isdeleted=0 and d.base_id=solutions.base_id and c.shop_id="+user.getCompanyId());//璁剧疆鏃犳晥璁块棶
+ }
return solutionsMapper.selectList(wrapper);
}
--
Gitblit v1.9.3