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

1、新增黄页

Browse Source 
2、新增学堂
3、其他调整、修改
This commit is contained in:
b2894lxlx
2023-12-04 01:32:33 +08:00
parent 78f89f2673
commit 16ebffc27e
50 changed files with 2724 additions and 1325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/process/detail.vue
+10 -9
View File
@@ -20,15 +20,15 @@
</view>
</view>
<view class="flex justify-end items-end"
v-if="info.answerEndTime && dayjs().diff(dayjs(info.answerEndTime), 'second') > 0">
v-if="info.answerEndTime && dayjs().diff(dayjs(info.answerEndTime), 'second') < 0">
<text>距离加工结束还有：</text>
<view class="border-main countdown text-main">{{
dayjs().diff(dayjs(info.answerEndTime), 'day')
dayjs(info.answerEndTime).diff(dayjs(), 'day')
}}
</view>
<text>天</text>
<view class="border-main countdown text-main">
{{ (dayjs().diff(dayjs(info.answerEndTime), 'hour')) % 24 }}
{{ (dayjs(info.answerEndTime).diff(dayjs(), 'hour')) % 24 }}
</view>
<text>时</text>
</view>
@@ -41,10 +41,10 @@
</text>
</view>
<el-button type="primary" @click.native="toQuote"
v-if="vk.getVuex('$user.userInfo._id') !== info.userId">我要申请加工
v-if="vk.getVuex('$user.userInfo._id') !== info.userId && info.status === 0">我要申请加工
</el-button>
<el-button type="primary" @click.native="showDialog = true"
v-else>查看收到的申请加工
v-else-if="vk.getVuex('$user.userInfo._id') === info.userId">查看收到的申请加工
</el-button>
</view>
<view class="item-wrap">
@@ -170,7 +170,7 @@
<text>收到的加工申请</text>
<el-button type="primary" @click.native="showDialog = false">关闭</el-button>
</view>
<view class="mt-15">
<view class="mt-15" v-if="info && info.quoteList">
<view class="request-header">
<text class="flex-1">加工商</text>
<text class="flex-1">报价</text>
@@ -185,7 +185,7 @@
<text class="flex-1">{{ item.totalPrice }}元</text>
<text class="flex-1">{{ item._add_time_str }}</text>
<text class="flex-1">
<el-button type="primary" @click.native="createContract(item)">选择</el-button>
<el-button type="primary" @click.native="createContract(item)" v-if="info.status === 0">选择</el-button>
</text>
</view>
</view>
@@ -225,14 +225,15 @@ export default {
toQuote() {
vk.navigateTo(`/pages/process/quote?sheetId=${this.id}`)
},
createContract({totalPrice, uid}) {
createContract({totalPrice, uid, _id}) {
vk.callFunction({
url: 'client/contract/kh/add',
data: {
type: 'process',
productTitle: this.info.title,
transactionId: vk.pubfn.createOrderNo("P", 20),
quoteId: this.id,
sheetId: this.id,
quoteId: _id,
buyer: vk.getVuex('$user.userInfo._id'),
seller: uid,
amount: totalPrice,
pages/process/list.vue
+61 -53
View File
@@ -15,7 +15,7 @@
<el-carousel height="170px">
<el-carousel-item v-for="item in 4" :key="item">
<image class="carousel-img"
src="/static/images/20210506/600fc93e6b85324b3ea1373ee264290d.jpg"
src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"
mode="aspectFill"></image>
</el-carousel-item>
</el-carousel>
@@ -70,7 +70,7 @@
</view>
</el-form-item>
<el-form-item label="供应商:" class="border-bottom pb-30">
<view class="flex justify-start items-center">
<view class="flex justify-start items-center flex-wrap">
<text @click="selectCompany(-1)" class="pointer mr-25"
:class="[checkCompanyList.length === 0 ? 'text-main selected-cate' : '']">全部
</text>
@@ -97,8 +97,12 @@
<!-- 商品列表 -->
<view class="sheet-list">
<vk-data-table ref="table1" :action="table1.action" :columns="table1.columns"
:customRightBtns="table1.customRightBtns"
:pagination="true"></vk-data-table>
:customRightBtns="table1.customRightBtns" :query-form-param="queryParam"
:pagination="true">
<template v-slot:action="{ row, column, index }">
<el-button size="mini" type="primary" plain @click.native="toDetail(row._id)">{{ vk.getVuex('$user.userInfo._id') === row.userId ? '查看' : '申请加工' }}</el-button>
</template>
</vk-data-table>
</view>
<common-footer></common-footer>
@@ -126,6 +130,7 @@ export default {
checkCategoryList: [],
showAllCompany: false,
keyword: '',
queryParam: {},
// 表格相关开始 -----------------------------------------------------------
table1: {
// 表格数据请求地址
@@ -150,16 +155,16 @@ export default {
}
})
},
customRightBtns: [{
title: '申请加工',
// icon: 'el-icon-search',
type: 'primary',
plain: true,
onClick: ({_id}) => {
this.toDetail(_id)
// vk.navigateTo('/pages/process/detail?id=' + item._id);
}
},],
// customRightBtns: [{
// title: vk.getVuex('$user.userInfo._id') '申请加工',
// // icon: 'el-icon-search',
// type: 'primary',
// plain: true,
// onClick: ({_id}) => {
// this.toDetail(_id)
// // vk.navigateTo('/pages/process/detail?id=' + item._id);
// }
// },],
// 表格字段显示规则
columns: [
{
@@ -178,23 +183,23 @@ export default {
// return val.map(item=>item.procureNumber + item.procureUnit).join("/")
// }
},
{
key: "productList",
title: "收货地",
type: "text",
formatter: (val, row, column, index) => {
let str = ""
try {
str = val.map(item => {
const addressStr = item.address.region.province.name + "-" + item.address.region.city.name + "-" + item.address.region.area.name
return addressStr
}).join("/")
} catch (err) {
str = ""
}
return str
}
},
// {
// key: "productList",
// title: "收货地",
// type: "text",
// formatter: (val, row, column, index) => {
// let str = ""
// try {
// str = val.map(item => {
// const addressStr = item.address.region.province.name + "-" + item.address.region.city.name + "-" + item.address.region.area.name
// return addressStr
// }).join("/")
// } catch (err) {
// str = ""
// }
// return str
// }
// },
{
key: "user",
title: "采购企业",
@@ -220,7 +225,9 @@ export default {
title: "发布时间",
type: "time",
},
{
key: "action", title: "操作", type: "html"
},
],
// 多选框选中的值
multipleSelection: [],
@@ -296,13 +303,13 @@ export default {
const {userInfo} = await vk.callFunction({
url: 'user/kh/getMyUserInfo'
})
if (!userInfo.fadadaConfirm && userInfo.authStatus === 1) {
if (!userInfo.fadadaConfirm || [-1, 2].includes(userInfo.authStatus)) {
this.$confirm('您尚未认证, 是否前往认证?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.getCertUrl()
vk.navigateTo({url: '/pages/user/user?menu=fadada'});
})
} else if (vk.pubfn.isNull(userInfo.businessCard)) {
this.$confirm('请完善名片信息', '提示', {
@@ -310,7 +317,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
vk.navigateTo('/pages/user/user?menu=business-card');
vk.navigateTo({url: '/pages/user/user?menu=business-card'});
})
} else {
vk.navigateTo({
@@ -328,7 +335,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.getCertUrl()
vk.navigateTo({url: '/pages/user/user?menu=fadada'});
})
} else if (vk.pubfn.isNull(userInfo.businessCard)) {
this.$confirm('请完善名片信息', '提示', {
@@ -352,25 +359,26 @@ export default {
})
})
let provinceCodes = this.checkProvinceList.map(item => item.code)
if (provinceCodes.includes(9999)) {
provinceCodes = []
this.queryParam.formData = {
keyword: this.keyword,
companyList: this.checkCompanyList,
categoryIds
}
this.$refs.table1.search()
vk.callFunction({
url: 'client/process/sheet/pub/getList',
data: {
pageIndex: pageIndex,
pageSize: 20,
keyword: this.keyword,
},
success: (data) => {
console.log('data: ', data);
this.goodsData = data
}
});
// vk.callFunction({
// url: 'client/process/sheet/pub/getList',
// data: {
// pageIndex: pageIndex,
// pageSize: 20,
// keyword: this.keyword,
// },
// success: (data) => {
// console.log('data: ', data);
//
// this.goodsData = data
// }
// });
},
getCertUrl() {
vk.callFunction({
pages/process/my.vue
+1 -1
View File
@@ -15,7 +15,7 @@
<el-carousel height="170px">
<el-carousel-item v-for="item in 4" :key="item">
<image class="carousel-img"
src="/static/images/20210506/600fc93e6b85324b3ea1373ee264290d.jpg"
src="/static/images/600fc93e6b85324b3ea1373ee264290d.jpg"
mode="aspectFill"></image>
</el-carousel-item>
</el-carousel>
pages/process/quote.vue
+2 -2
View File
@@ -51,7 +51,7 @@ export default {
action: "client/process/quote/kh/addQuote",
// 表单字段显示规则
columns: [
{key: "totalPrice", title: "货款总价", type: "money"},
{key: "totalPrice", title: "货款总价", type: "number"},
{key: "totalPriceStr", title: "人民币大写", type: "text"},
{key: "remark", title: "报价单详情", type: "editor"},
],
@@ -97,7 +97,7 @@ export default {
},
methods: {
onFormSuccess() {
vk.navigateBack()
},
// 提交报价单
async submit() {
pages/process/release.vue
+11 -11
View File
@@ -59,15 +59,11 @@
<el-input v-model="form1.data.num" type="number"/>
</el-form-item>
<el-form-item label="附件内容" required>
<el-upload action="#" :on-change="selectFile" :auto-upload="false" ref="uploader">
<!-- <el-upload action="#" :before-upload="upload">-->
<view class="attachment-upload" v-if="!form1.data.attachment">
<i class="el-icon-plus"/>
</view>
<data-file theme="two-tone" size="24" :fill="['#333' ,'#ffffff']" strokeLinecap="square"
v-else/>
<!-- <el-image v-else :url="form1.data.attachment" fit="cover"/>-->
</el-upload>
<!-- <el-upload action="#" :before-upload="upload">-->
<vk-data-upload v-model="form1.data.files" v-if="!form1.data.attachment" :limit="1" accept="image/*,application/pdf"/>
<data-file theme="two-tone" size="24" :fill="['#333' ,'#ffffff']" strokeLinecap="square"
v-else/>
<!-- <el-image v-else :url="form1.data.attachment" fit="cover"/>-->
</el-form-item>
</view>
@@ -114,13 +110,17 @@
<text>开票时间：</text>
<el-radio-group v-model="form1.data.writeInvoiceTime">
<el-radio v-for="(item, index) in WRITE_INVOICE_TIME" :key="index" :label="index">
{{ item }}</el-radio>
{{ item }}
</el-radio>
</el-radio-group>
</view>
<view class="mb-20 flex justify-start items-center">
<text>发票种类：</text>
<el-radio-group v-model="form1.data.invoiceType">
<el-radio v-for="(item, index) in INVOICE_TYPE" :key="index" :label="index">{{ item }}</el-radio>
<el-radio v-for="(item, index) in INVOICE_TYPE" :key="index" :label="index">{{
item
}}
</el-radio>
</el-radio-group>
<view class="ml-20 flex justify-start items-center">
<text class="label-width">其他要求：</text>