1

uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/quote/kh/confirmQuote.js

@@ -1,4 +1,6 @@
 'use strict';
+
+const dbName = require('../../../../../dao/config.js')
 module.exports = {
 	/**
 	 * 同意合作
@@ -40,25 +42,62 @@ module.exports = {
 				status: 1
 			}
 		})
-
-		// 获取商品信息
-		const productTitle = quote.productList.map(item => {
-			return item.name
-		}).join("/")
-
-
+		
 		if (!quote) {
 			return {
 				code: -1,
 				msg: '请刷新页面'
 			}
 		}
+		// 获取乙方信息
+		const quoteUser = await vk.baseDao.select({
+			dbName: dbName.user,
+			getMain: true,
+			getOne: true,
+			whereJson: {
+				_id: quote.userId
+			}
+		})
+
+		// 获取商品信息
+		const productTitle = quote.productList.map(item => {
+			return item.name
+		}).join("/")
+		
+		
+		// 获取询价单信息
+		const sheet = await vk.baseDao.selects({
+			dbName: dbName.enquirySheet,
+			whereJson: {_id: quote.sheetId},
+			getMain: true,
+			getOne: true
+		})
+		
+		const fadadaContractId = vk.pubfn.createOrderNo("E", 20)
+		// 上传合同模板并填充
+		// if(sheet.signMethod == 0 && sheet.contractType == 0) {
+		// 	pubFun.fadada('generate_contract.api', {
+		// 		template_id: '20231120',
+		// 		contract_id: fadadaContractId,
+		// 		parameter_map: JSON.stringify({
+		// 			jiaName: userInfo.accountType == 1?userInfo.person.personName: userInfo.company.companyName,
+		// 			jiaDate: '',
+		// 			jiaPhone: '',
+		// 			yiName: userInfo.accountType == 1?userInfo.person.personName: userInfo.company.companyName,
+		// 			yiDate: '',
+		// 			yiPhone: '',
+		// 			sellerSupplement: '',
+		// 		}),
+		// 	})
+		// }
+
+
+		
 		// 新增合同记录
 		const contractId = await vk.baseDao.add({
 			dbName: 'jjx-contract',
 			dataJson: {
-				fadadaContractId: vk.pubfn.createOrderNo("E", 20),
-				
+				fadadaContractId: fadadaContractId,
 				contractBase: '', // 原始合同
 				contractHistory: [], // 历史合同
 				contractFinal: '', // 归档合同
@@ -71,10 +110,15 @@ module.exports = {
 				productTitle,
 				tradeMethod: quote.tradeMethod,
 				partyCount: 2,
-				signCount: 0
+				signCount: 0,
+				contractType: sheet.contractType,
+				signMethod: sheet.signMethod,
+				sellerSupplement: sheet.sellerSupplement,
 			}
 		})
 		
+		// 上传合同模板
+		
 		//新增 用户与合同的关联记录 
 		await vk.daoCenter.userContractDao.adds([
 			{

uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/kh/delete.js

@@ -0,0 +1,28 @@
+'use strict';
+const dbName = require('../../../../../dao/config.js')
+module.exports = {
+	/**
+	 * XXXnameXXX
+	 * @url client/enquiry/sheet/kh/delete 前端调用的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 { _id } = data;
+		if(vk.pubfn.isNull(_id)){
+			return { code : -1, msg : 'id不能为空' };
+		}
+		await vk.baseDao.deleteById({
+			dbName: dbName.enquirySheet,
+			id:_id
+		});
+
+		// 业务逻辑结束-----------------------------------------------------------
+		return res;
+	}
+}

uniCloud-aliyun/cloudfunctions/router/service/client/enquiry/sheet/pub/getList.js

@@ -9,14 +9,30 @@ module.exports = {
 	main: async (event) => {
 		let { data = {}, userInfo, util, filterResponse, originalParam } = event;
 		let { customUtil, uniID, config, pubFun, vk, db, _ } = util;
-		let { uid, userId } = data;
+		let { uid, userId,pageIndex,pageSize,keyword,categoryIds,provinceCodes } = data;
 		let res = { code: 0, msg: "" };
 		// 业务逻辑开始-----------------------------------------------------------
 		let dbName = "jjx-enquiry-sheet";
 		
-		res = await vk.baseDao.getTableData({
+		
+		let whereJson = {};
+		
+		if(vk.pubfn.isNotNull(keyword)) {
+			whereJson.name = new RegExp(keyword)
+		}
+		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,
-			data,
+			pageIndex,
+			pageSize,
+			whereJson,
 			foreignDB: [
 				{
 					dbName:"uni-id-users",