b2894lxlx/jjx-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20231129

Browse Source
This commit is contained in:
b2894lxlx
2023-11-29 16:38:19 +08:00
parent 882419768f
commit e7196c4cdc
79 changed files with 7436 additions and 6564 deletions
Download Patch File Download Diff File Expand all files Collapse all files
uniCloud-aliyun/cloudfunctions/router/service/client/contract/kh/generate.js
+1 -1
View File
@@ -25,7 +25,7 @@ module.exports = {
// 上传合同模板并填充
pubFun.fadada('generate_contract.api', {
template_id: '20231120',
contract_id: fadadaContractId,
contract_id: contract.fadadaContractId,
parameter_map: JSON.stringify({
jiaName: userInfo.accountType == 1?userInfo.person.personName: userInfo.company.companyName,
jiaDate: '',
uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/quote/kh/addQuote.js
+59 -63
View File
@@ -1,67 +1,63 @@
'use strict';
module.exports = {
/**
* 新增报价
* @url client/enquiry/quote/kh/addQuote 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let { data = {}, userInfo, util, filterResponse, originalParam } = event;
let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
let { uid, sheet, totalPrice } = data;
let { company,manager,person,accountType} = userInfo
let res = { code: 0, msg: "" };
// 业务逻辑开始-----------------------------------------------------------
let subjectName = ''
let subjectMobile = ''
let managerName = ''
let managerMobile = ''
if(accountType == 1) {
subjectName = person.personName
subjectMobile = person.mobile
}else {
subjectName = company.companyName
subjectMobile = company.legalMobile
if(manager.mobile && manager.personName){
managerName = manager.personName
managerMobile = manager.mobile
}
}
// 添加报价单
res.data = await vk.baseDao.add({
dbName:"jjx-enquiry-quote",// 表名
dataJson:{ // 需要新增的数据 json格式
userId: uid,
productList: sheet.productList,
sheetId: sheet._id,
sheetUserId: sheet.userId,
subjectName,
subjectMobile,
managerName,
managerMobile,
accountType,
totalPrice,
status: 0
}
});
// 更新用户数据
vk.baseDao.update({
dbName:"jjx-enquiry-sheet",// 表名
whereJson: {
_id: sheet._id,
},
dataJson: {
answerNumber: _.inc(1)
}
})
/**
* 新增报价
* @url client/enquiry/quote/kh/addQuote 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let {data = {}, userInfo, util, filterResponse, originalParam} = event;
let {customUtil, uniID, config, pubFun, vk, db, _} = util;
let {uid, sheet, totalPrice} = data;
let {company, manager, person, accountType} = userInfo
let res = {code: 0, msg: ""};
// 业务逻辑开始-----------------------------------------------------------
// 业务逻辑结束-----------------------------------------------------------
return res;
}
let subjectName = ''
let subjectMobile = ''
let managerName = ''
let managerMobile = ''
if (accountType == 1) {
subjectName = person.personName
subjectMobile = person.mobile
} else {
subjectName = company.companyName
subjectMobile = company.legalMobile
if (manager.mobile && manager.personName) {
managerName = manager.personName
managerMobile = manager.mobile
}
}
// 添加报价单
res.data = await vk.baseDao.add({
dbName: "jjx-enquiry-quote",// 表名
dataJson: { // 需要新增的数据 json格式
...data,
...{
userId: data.uid,
status: 0,
subjectName,
subjectMobile,
managerName,
managerMobile,
}
}
});
vk.baseDao.update({
dbName: "jjx-enquiry-sheet",// 表名
whereJson: {
_id: data.sheetId,
},
dataJson: {
answerNumber: _.inc(1)
}
})
// 业务逻辑结束-----------------------------------------------------------
return res;
}
}
uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/kh/add.js
+30 -64
View File
@@ -1,69 +1,35 @@
'use strict';
module.exports = {
/**
* XXXnameXXX
* @url client/enquiry/sheet/kh/add 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let { data = {}, userInfo, util, filterResponse, originalParam } = event;
let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
let { uid } = data;
let res = { code: 0, msg: "" };
// 业务逻辑开始-----------------------------------------------------------
// 生成询价编号
let {
productList,
remark,
invoice,
writeInvoiceTime,
nvoiceType,
transportDocuments,
otherTransportDocuments,
transportLimit,
tradeMethod,
payMethod,
advancePayRate,
otherPayMethod,
reputationPayDay,
answerTime,
earnestMoney,
status
} = data;
// 这里需要把 params1 params2 params3 改成你数据库里允许用户添加的字段
let dbName = "jjx-enquiry-sheet";
res.id = await vk.baseDao.add({
dbName,
dataJson:{
productList,
remark,
invoice,
writeInvoiceTime,
nvoiceType,
transportDocuments,
otherTransportDocuments,
transportLimit,
tradeMethod,
payMethod,
advancePayRate,
otherPayMethod,
reputationPayDay,
answerTime,
earnestMoney,
status,
answerNumber: 0,
userId: uid
}
});
/**
* XXXnameXXX
* @url client/enquiry/sheet/kh/add 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let {data = {}, userInfo, util, filterResponse, originalParam} = event;
let {customUtil, uniID, config, pubFun, vk, db, _} = util;
let {uid} = data;
let res = {code: 0, msg: ""};
// 业务逻辑开始-----------------------------------------------------------
// 生成询价编号
// 这里需要把 params1 params2 params3 改成你数据库里允许用户添加的字段
let dbName = "jjx-enquiry-sheet";
res.id = await vk.baseDao.add({
dbName,
dataJson: {
...data,
...{
answerNumber: 0,
userId: uid
}
}
});
// 业务逻辑结束-----------------------------------------------------------
return res;
}
// 业务逻辑结束-----------------------------------------------------------
return res;
}
}
uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/pub/getList.js
+15 -3
View File
@@ -51,12 +51,24 @@ module.exports = {
businessCard: true,
accountType: true,
},
}
},
]
});
const rows = res.rows
rows.forEach((row, rowIndex) => {
row.productList.forEach(async (product, productIndex) => {
const template = await vk.baseDao.findById({
dbName,
data: {
id: product.goodsId
}
});
rows[rowIndex].productList[productIndex].template = template
})
})
res.rows = rows
// 业务逻辑结束-----------------------------------------------------------
return res;
}
uniCloud-aliyun/cloudfunctions/router/service/client/fadada.js
+2 -1
View File
@@ -118,7 +118,8 @@ var cloudObject = {
company: res.data.company,
manager: res.data.manager,
BankCard: res.data.BankCard,
fadadaConfirm: true
fadadaConfirm: true,
status: 1
}
});
uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/kh/add.js
+25 -17
View File
@@ -1,23 +1,31 @@
'use strict';
const dbName = require('../../../../../dao/config.js')
module.exports = {
/**
* 新增加工单
* @url client/process/kh/add 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let { data = {}, userInfo, util, filterResponse, originalParam } = event;
let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
let { uid } = data;
let res = { code: 0, msg: "" };
// 业务逻辑开始-----------------------------------------------------------
/**
* 新增加工单
* @url client/process/kh/add 前端调用的url参数地址
* data 请求参数
* @param event
*/
main: async (event) => {
let {data = {}, userInfo, util, filterResponse, originalParam} = event;
let {customUtil, uniID, config, pubFun, vk, db, _} = util;
let res = {code: 0, msg: ""};
// 业务逻辑开始-----------------------------------------------------------
let dbName = "jjx-process-sheet";
res.id = await vk.baseDao.add({
dbName,
dataJson: {
...data,
...{
userId: data.uid,
answerNumber: 0
}
}
});
// 业务逻辑结束-----------------------------------------------------------
return res;
}
// 业务逻辑结束-----------------------------------------------------------
return res;
}
}
uniCloud-aliyun/cloudfunctions/router/service/client/process/sheet/pub/getList.js
+59 -17
View File
@@ -1,23 +1,65 @@
'use strict';
const dbName = require('../../../../../dao/config.js')
module.exports = {
/**
* 获取加工单
* @url client/process/pub/getList 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let { data = {}, userInfo, util, filterResponse, originalParam } = event;
let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
let { uid } = data;
let res = { code: 0, msg: "" };
// 业务逻辑开始-----------------------------------------------------------
/**
* 获取加工单
* @url client/process/pub/getList 前端调用的url参数地址
* data 请求参数
* @param {String} params1 参数1
*/
main: async (event) => {
let {data = {}, userInfo, util, filterResponse, originalParam} = event;
let {customUtil, uniID, config, pubFun, vk, db, _} = util;
let {uid, userId, pageIndex, pageSize, keyword, categoryIds, provinceCodes} = data;
let res = {code: 0, msg: ""};
// 业务逻辑开始-----------------------------------------------------------
const dbName = "jjx-process-sheet";
const whereJson = {};
if (vk.pubfn.isNotNull(keyword)) {
whereJson.name = new RegExp(keyword)
}
if (vk.pubfn.isNotNull(userId)) {
whereJson.userId = userId
}
if (vk.pubfn.isNotNull(categoryIds)) {
whereJson.categoryIds = _.in(categoryIds)
}
if (vk.pubfn.isNotNull(provinceCodes)) {
whereJson['address.province.code'] = _.in(provinceCodes)
}
res = await vk.baseDao.selects({
dbName,
pageIndex,
pageSize,
whereJson,
foreignDB: [
{
dbName: "uni-id-users",
localKey: "userId",
foreignKey: "_id",
as: "user",
limit: 1, // limit=1则以对象形式返回
fieldJson: {
_id: true,
company: {
companyName: true
},
person: {
personName: true
},
businessCard: true,
accountType: true,
},
}
]
});
// 业务逻辑结束-----------------------------------------------------------
return res;
}
// 业务逻辑结束-----------------------------------------------------------
return res;
}
}
uniCloud-aliyun/cloudfunctions/router/service/user/kh/updateUser.js
+5 -5
View File
@@ -18,12 +18,12 @@ module.exports = {
let res = {};
// 业务逻辑开始-----------------------------------------------------------
// 允许修改的字段列表
let updateKeys = ["nickname", "avatar", "gender", "social_info", 'businessCard'];
// let updateKeys = ["nickname", "avatar", "gender", "social_info", 'businessCard'];
let dataJson = {};
for (let i in updateKeys) {
let key = updateKeys[i];
if (vk.pubfn.isNotNull(data[key])) dataJson[key] = data[key];
}
// for (let i in updateKeys) {
// let key = updateKeys[i];
// if (vk.pubfn.isNotNull(data[key])) dataJson[key] = data[key];
// }
dataJson.uid = uid;
res = await uniID.updateUser(dataJson);
// 业务逻辑结束-----------------------------------------------------------